fix(game/five): updateBusySpinner thread constraint check

This should work as a temporary fix to prevent crashes when for unknown reasons 'updateBusySpinner' gets called from the Render thread instead of the Main thread, which causes an inner function call to return a nullptr. due to failing thread constraint checks.
citizenfx · Nov 20, 2024 · 73812bd · 73812bd
1 parent 8a6a363
commit 73812bd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/code/components/loading-screens-five/src/HookLoadingScreens.cpp b/code/components/loading-screens-five/src/HookLoadingScreens.cpp
@@ -483,6 +483,12 @@ static InitFunction initFunction([] ()
 		{
 			if (*g_scaleformMgr)
 			{
+				if (GetCurrentThreadId() != g_mainThreadId)
+				{
+					trace("Error: BusySpinner update called from non-main thread!\n");
+					return;
+				}
+
 				setupBusySpinner(1);
 				*spinnerDep = true;
 				updateBusySpinner();

diff --git a/code/components/rage-input-five/src/InputHook.cpp b/code/components/rage-input-five/src/InputHook.cpp
@@ -411,8 +411,6 @@ static hook::cdecl_stub<bool(wchar_t, int)> ProcessWMChar([]()
 static ReverseGameInputState lastInput;
 static ReverseGameInputState curInput;
 
-static bool g_mainThreadId;
-
 #include <queue>
 
 extern void DoPatchMouseScrollDelta();

diff --git a/code/components/rage-nutsnbolts-five/include/nutsnbolts.h b/code/components/rage-nutsnbolts-five/include/nutsnbolts.h
@@ -15,6 +15,8 @@
 
 #define HAS_EARLY_GAME_FRAME
 
+extern NUTSNBOLTS_EXPORT DWORD g_mainThreadId;
+
 extern NUTSNBOLTS_EXPORT fwEvent<> OnLookAliveFrame;
 extern NUTSNBOLTS_EXPORT fwEvent<> OnGameFrame;
 extern NUTSNBOLTS_EXPORT fwEvent<> OnEarlyGameFrame;

diff --git a/code/components/rage-nutsnbolts-five/src/FrameHook.cpp b/code/components/rage-nutsnbolts-five/src/FrameHook.cpp
@@ -13,6 +13,8 @@
 #include <ICoreGameInit.h>
 #include <CrossBuildRuntime.h>
 
+DWORD g_mainThreadId;
+
 fwEvent<> OnLookAliveFrame;
 fwEvent<> OnEarlyGameFrame;
 fwEvent<> OnGameFrame;
@@ -64,7 +66,6 @@ static uint32_t g_lastCriticalFrame;
 static std::mutex g_gameFrameMutex;
 static std::mutex g_earlyGameFrameMutex;
 static std::mutex g_criticalFrameMutex;
-static DWORD g_mainThreadId;
 static bool g_executedOnMainThread;
 
 // NOTE: depends indirectly on GameProfiling.cpp in gta:core!