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

Handle potentially calling SDL_JoystickUpdate() and SDL_JoystickQuit() at the same time.

This commit is contained in:
Sam Lantinga 2019-03-27 08:17:05 -07:00
parent 2fbfe8b912
commit 9a8d5215c6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/joystick/SDL_joystick.c
View File

@ -699,9 +699,12 @@ SDL_JoystickQuit(void)
int i; int i;
/* Make sure we're not getting called in the middle of updating joysticks */ /* Make sure we're not getting called in the middle of updating joysticks */
SDL_assert(!SDL_updating_joystick);
SDL_LockJoysticks(); SDL_LockJoysticks();
while (SDL_updating_joystick) {
SDL_UnlockJoysticks();
SDL_Delay(1);
SDL_LockJoysticks();
}
/* Stop the event polling */ /* Stop the event polling */
while (SDL_joysticks) { while (SDL_joysticks) {
@ -724,8 +727,9 @@ SDL_JoystickQuit(void)
SDL_JoystickAllowBackgroundEventsChanged, NULL); SDL_JoystickAllowBackgroundEventsChanged, NULL);
if (SDL_joystick_lock) { if (SDL_joystick_lock) {
SDL_DestroyMutex(SDL_joystick_lock); SDL_mutex *mutex = SDL_joystick_lock;
SDL_joystick_lock = NULL; SDL_joystick_lock = NULL;
SDL_DestroyMutex(mutex);
} }
SDL_GameControllerQuitMappings(); SDL_GameControllerQuitMappings();