ChaosMod: Mitigate crashes for direct mod hot reloading hack

gta-chaos-mod · Feb 6, 2025 · da50455 · da50455
1 parent 5a388f1
commit da50455
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/ChaosMod/Main.cpp b/ChaosMod/Main.cpp
@@ -342,21 +342,16 @@ namespace Main
 	static HMODULE ms_ModuleHandle = NULL;
 	EXTERN_C IMAGE_DOS_HEADER __ImageBase;
 
-	void OnInit()
+	void OnRun()
 	{
-		LOG("Running mod init");
+		SetUnhandledExceptionFilter(CrashHandler);
 
-		if (DoesFileExist("ScriptHookV.dev"))
+		if (!ms_ModuleHandle && DoesFileExist("ScriptHookV.dev"))
 		{
 			WCHAR fileName[MAX_PATH] = {};
 			GetModuleFileName(reinterpret_cast<HINSTANCE>(&__ImageBase), fileName, MAX_PATH);
 			ms_ModuleHandle = LoadLibrary(fileName);
 		}
-	}
-
-	void OnRun()
-	{
-		SetUnhandledExceptionFilter(CrashHandler);
 
 		MainRun();
 	}
@@ -421,8 +416,11 @@ namespace Main
 			}
 			else if (key == 0x52 && ms_ModuleHandle) // R
 			{
+				// Prevention for (somehow) double unloading
+				auto handle     = ms_ModuleHandle;
+				ms_ModuleHandle = NULL;
 				OnCleanup();
-				FreeModule(ms_ModuleHandle);
+				FreeModule(handle);
 			}
 		}
 

diff --git a/ChaosMod/Main.h b/ChaosMod/Main.h
@@ -9,7 +9,6 @@ struct IDXGISwapChain;
 
 namespace Main
 {
-	void OnInit();
 	void OnRun();
 	void OnCleanup();
 	void OnKeyboardInput(DWORD key, WORD repeats, BYTE scanCode, BOOL isExtended, BOOL isWithAlt, BOOL wasDownBefore,

diff --git a/ChaosMod/dllmain.cpp b/ChaosMod/dllmain.cpp
@@ -17,7 +17,6 @@ BOOL APIENTRY DllMain(HMODULE instance, DWORD reason, LPVOID reserved)
 
 		RAW_LOG("Chaos Mod v" MOD_VERSION "\n\n");
 
-		Main::OnInit();
 		Memory::Init();
 
 		scriptRegister(instance, Main::OnRun);