eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-06-06 07:20:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed deadlock when shutting down the Windows joystick system

Browse source
This commit is contained in:
Sam Lantinga 2022-08-30 12:58:38 -07:00
parent 371735e95b
commit 92d3fc4883
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/joystick/windows/SDL_windowsjoystick.c
View file

@ -429,7 +429,12 @@ SDL_StopJoystickThread(void)
SDL_CondBroadcast(s_condJoystickThread); /* signal the joystick thread to quit */
SDL_UnlockMutex(s_mutexJoyStickEnum);
PostThreadMessage(SDL_GetThreadID(s_joystickThread), WM_QUIT, 0, 0);
/* Unlock joysticks while the joystick thread finishes processing messages */
SDL_AssertJoysticksLocked();
SDL_UnlockJoysticks();
SDL_WaitThread(s_joystickThread, NULL); /* wait for it to bugger off */
SDL_LockJoysticks();
SDL_DestroyCond(s_condJoystickThread);
s_condJoystickThread = NULL;