mirror of https://github.com/libsdl-org/SDL
Fixed race condition at startup that could cause a crash in the XInput driver
This commit is contained in:
parent
6e5bd58c4c
commit
6d7c211faf
|
@ -46,11 +46,13 @@ bool SDL_XINPUT_Enabled(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()) {
|
||||
s_bXInputEnabled = false; // oh well.
|
||||
if (enabled && !WIN_LoadXInputDLL()) {
|
||||
enabled = false; // oh well.
|
||||
}
|
||||
s_bXInputEnabled = enabled;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -218,7 +220,7 @@ void SDL_XINPUT_JoystickDetect(JoyStick_DeviceData **pContext)
|
|||
{
|
||||
int iuserid;
|
||||
|
||||
if (!s_bXInputEnabled || !XINPUTGETCAPABILITIES) {
|
||||
if (!s_bXInputEnabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue