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

Fixed crash when a controller is disconnected while rumble is pending

This commit is contained in:
Sam Lantinga 2020-03-04 14:59:44 -08:00
parent 281d05a6d1
commit 428cfddb4c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/joystick/hidapi/SDL_hidapi_rumble.c
View File

@ -76,7 +76,9 @@ static int SDL_HIDAPI_RumbleThread(void *data)
if (request) { if (request) {
SDL_LockMutex(request->device->dev_lock); SDL_LockMutex(request->device->dev_lock);
hid_write(request->device->dev, request->data, request->size); if (request->device->dev) {
hid_write( request->device->dev, request->data, request->size );
}
SDL_UnlockMutex(request->device->dev_lock); SDL_UnlockMutex(request->device->dev_lock);
(void)SDL_AtomicDecRef(&request->device->rumble_pending); (void)SDL_AtomicDecRef(&request->device->rumble_pending);
SDL_free(request); SDL_free(request);

2
src/joystick/hidapi/SDL_hidapi_switch.c
View File

@ -477,7 +477,7 @@ static SDL_bool BTrySetupUSB(SDL_DriverSwitch_Context *ctx)
return SDL_FALSE; return SDL_FALSE;
} }
if (!WriteProprietary(ctx, k_eSwitchProprietaryCommandIDs_HighSpeed, NULL, 0, SDL_TRUE)) { if (!WriteProprietary(ctx, k_eSwitchProprietaryCommandIDs_HighSpeed, NULL, 0, SDL_TRUE)) {
/* The 8BitDo M30 doesn't respond to this command, but otherwise works correctly */ /* The 8BitDo M30 and SF30 Pro don't respond to this command, but otherwise work correctly */
/*return SDL_FALSE;*/ /*return SDL_FALSE;*/
} }
if (!WriteProprietary(ctx, k_eSwitchProprietaryCommandIDs_Handshake, NULL, 0, SDL_TRUE)) { if (!WriteProprietary(ctx, k_eSwitchProprietaryCommandIDs_Handshake, NULL, 0, SDL_TRUE)) {