fix(extra-natives-five): add try...catch to Windows.Gaming.Input func…

…tion Seems this DLL fails to initiate sometimes?
citizenfx · Dec 12, 2023 · 339c505 · 339c505
1 parent 81f6957
commit 339c505
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/code/components/extra-natives-five/src/VehicleExtraNatives.cpp b/code/components/extra-natives-five/src/VehicleExtraNatives.cpp
@@ -1774,8 +1774,16 @@ static HookFunction inputFunction([]()
 			return;
 		}
 
-		addedRevoker = Gamepad::GamepadAdded(winrt::auto_revoke, OnGamepadAdded);
-		removedRevoker = Gamepad::GamepadRemoved(winrt::auto_revoke, OnGamepadRemoved);
+		try
+		{
+			addedRevoker = Gamepad::GamepadAdded(winrt::auto_revoke, OnGamepadAdded);
+			removedRevoker = Gamepad::GamepadRemoved(winrt::auto_revoke, OnGamepadRemoved);
+		}
+		catch (...)
+		{
+			trace("Failed to add GamepadAdded handlers in Windows.Gaming.Input.dll");
+			return;
+		}
 
 		if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)hLib, &hLib))
 		{