mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-18 17:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed deadlock in HIDAPI joystick system

Browse Source
This commit is contained in:
Sam Lantinga
2020-01-13 22:05:54 -08:00
parent 3a796d6a58
commit 7775f7cedf
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/joystick/SDL_joystick.c
View File

@@ -751,10 +751,17 @@ SDL_JoystickSetPlayerIndex(SDL_Joystick * joystick, int player_index)
int
SDL_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms)
{
int result;
if (!SDL_PrivateJoystickValid(joystick)) {
return -1;
}
return joystick->driver->Rumble(joystick, low_frequency_rumble, high_frequency_rumble, duration_ms);
SDL_LockJoysticks();
result = joystick->driver->Rumble(joystick, low_frequency_rumble, high_frequency_rumble, duration_ms);
SDL_UnlockJoysticks();
return result;
}
/*