Do not dynamically allocate global 'memory' object

ForBai · Jun 23, 2022 · 5fc8df3 · 5fc8df3
1 parent ee4c757
commit 5fc8df3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Source/Hooks.cpp b/Source/Hooks.cpp
@@ -544,7 +544,7 @@ Hooks::Hooks(HMODULE moduleHandle) noexcept : moduleHandle{ moduleHandle }
 
     // interfaces and memory shouldn't be initialized in wndProc because they show MessageBox on error which would cause deadlock
     interfaces = std::make_unique<const Interfaces>();
-    memory = std::make_unique<const Memory>();
+    memory.emplace(Memory{});
 
     window = FindWindowW(L"Valve001", nullptr);
     originalWndProc = WNDPROC(SetWindowLongPtrW(window, GWLP_WNDPROC, LONG_PTR(&wndProc)));

diff --git a/Source/Memory.h b/Source/Memory.h
@@ -2,7 +2,7 @@
 
 #include <array>
 #include <cstdint>
-#include <memory>
+#include <optional>
 #include <type_traits>
 
 #include "SDK/Platform.h"
@@ -171,4 +171,4 @@ class Memory {
     std::uintptr_t setDynamicAttributeValueFn;
 };
 
-inline std::unique_ptr<const Memory> memory;
+inline std::optional<const Memory> memory;