encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed infinite loop shutting down WGI controllers 

We are guaranteed that the lock will be held during shutdown, so if we are in InvokeRemoved(), it's because we're shutting down controllers and need to remove them from our internal list.

Fixes https://github.com/libsdl-org/SDL/issues/7016

(cherry picked from commit ac99db9fc8d528a79abb98a5641e0fd94aa20a9e)
(cherry picked from commit ebc2fb411f178c806119b57ae3c18553d7391a13)
This commit is contained in:
Sam Lantinga 2023-01-08 09:32:31 -08:00
parent 8e31fc4130
commit 3c72e2de4d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/joystick/windows/SDL_windows_gaming_input.c
View File

@ -411,7 +411,7 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeRemo
SDL_LockJoysticks(); SDL_LockJoysticks();
/* Can we get delayed calls to InvokeRemoved() after WGI_JoystickQuit()? */ /* Can we get delayed calls to InvokeRemoved() after WGI_JoystickQuit()? */
if (SDL_JoysticksQuitting() || !SDL_JoysticksInitialized()) { if (!SDL_JoysticksInitialized()) {
SDL_UnlockJoysticks(); SDL_UnlockJoysticks();
return S_OK; return S_OK;
} }