gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed race condition at startup that could cause a crash in the XInput driver

Browse Source
This commit is contained in:
Sam Lantinga
2024-09-06 10:15:16 -07:00
parent 6e5bd58c4c
commit 6d7c211faf
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/joystick/windows/SDL_xinputjoystick.c
View File

@@ -46,11 +46,13 @@ bool SDL_XINPUT_Enabled(void)
bool SDL_XINPUT_JoystickInit(void) bool SDL_XINPUT_JoystickInit(void)
{ {
s_bXInputEnabled = SDL_GetHintBoolean(SDL_HINT_XINPUT_ENABLED, true); bool enabled = SDL_GetHintBoolean(SDL_HINT_XINPUT_ENABLED, true);
if (s_bXInputEnabled && !WIN_LoadXInputDLL()) { if (enabled && !WIN_LoadXInputDLL()) {
s_bXInputEnabled = false; // oh well. enabled = false; // oh well.
} }
s_bXInputEnabled = enabled;
return true; return true;
} }
@@ -218,7 +220,7 @@ void SDL_XINPUT_JoystickDetect(JoyStick_DeviceData **pContext)
{ {
int iuserid; int iuserid;
if (!s_bXInputEnabled || !XINPUTGETCAPABILITIES) { if (!s_bXInputEnabled) {
return; return;
} }