eden-emu/SDL
18
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure we completely unlock joysticks when opening HIDAPI devices

Browse source 
Also lock the joysticks when adding and removing Android joysticks
This commit is contained in:
Sam Lantinga 2022-10-17 11:10:53 -07:00
parent 47ba997f06
commit 333935ff3f
4 changed files with 47 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/joystick/hidapi/SDL_hidapijoystick.c
View file

@ -368,15 +368,21 @@ HIDAPI_SetupDeviceDriver(SDL_HIDAPI_Device *device, SDL_bool *removed)
*
* See https://github.com/libsdl-org/SDL/issues/6347 for details
*/
int lock_count = 0;
SDL_HIDAPI_Device *curr;
SDL_hid_device *dev;
char *path;
char *path = SDL_strdup(device->path);
SDL_AssertJoysticksLocked();
path = SDL_strdup(device->path);
SDL_UnlockJoysticks();
while (SDL_JoysticksLocked()) {
++lock_count;
SDL_UnlockJoysticks();
}
dev = SDL_hid_open_path(path, 0);
SDL_LockJoysticks();
while (lock_count > 0) {
--lock_count;
SDL_LockJoysticks();
}
SDL_free(path);
/* Make sure the device didn't get removed while opening the HID path */