fix: only use imgui io after init (#622)

* fix: only use imgui io after init * refactor: getsingleton
doodlum · Oct 10, 2024 · 0995e6a · 0995e6a
1 parent 7ac4fa9
commit 0995e6a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
@@ -355,8 +355,9 @@ namespace Hooks
 	{
 		static LRESULT thunk(HWND a_hwnd, UINT a_msg, WPARAM a_wParam, LPARAM a_lParam)
 		{
-			if (a_msg == WM_KILLFOCUS) {
-				Menu::GetSingleton()->OnFocusLost();
+			auto menu = Menu::GetSingleton();
+			if (a_msg == WM_KILLFOCUS && menu->initialized) {
+				menu->OnFocusLost();
 				auto& io = ImGui::GetIO();
 				io.ClearInputKeys();
 				io.ClearEventsQueue();

diff --git a/src/Menu.cpp b/src/Menu.cpp
@@ -204,6 +204,8 @@ void Menu::Init(IDXGISwapChain* swapchain, ID3D11Device* device, ID3D11DeviceCon
 	style.MouseCursorScale = 1.f;
 	auto& io = ImGui::GetIO();
 	io.FontGlobalScale = trueScale;
+
+	initialized = true;
 }
 
 void Menu::DrawSettings()

diff --git a/src/Menu.h b/src/Menu.h
@@ -35,6 +35,8 @@ class Menu
 		return &menu;
 	}
 
+	bool initialized = false;
+
 	void Load(json& o_json);
 	void Save(json& o_json);