commit c76bfc125b2ea1d9118a63f7c470d4d6447a3233
author Sam Lantinga <slouken@libsdl.org> Thu Jan 09 14:53:30 2020 -0800
committer Sam Lantinga <slouken@libsdl.org> Thu Jan 09 14:53:30 2020 -0800
tree affec09944d480df29f9dce05e36836cfb3258f7
parent 0a7fc0f8378f56f66b5d780a4dd308623880a6c8

Fixed crash when unplugging a HIDAPI controller

src/joystick/hidapi/SDL_hidapijoystick.c

diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
index b9277f9..925982f 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -491,10 +491,6 @@
 
     /* Disconnect any joysticks */
     while (device->num_joysticks) {
-        SDL_Joystick *joystick = SDL_JoystickFromInstanceID(device->joysticks[0]);
-        if (joystick) {
-            HIDAPI_JoystickClose(joystick);
-        }
         HIDAPI_JoystickDisconnected(device, device->joysticks[0]);
     }
 
@@ -606,6 +602,11 @@
 
     for (i = 0; i < device->num_joysticks; ++i) {
         if (device->joysticks[i] == joystickID) {
+            SDL_Joystick *joystick = SDL_JoystickFromInstanceID(joystickID);
+            if (joystick) {
+                HIDAPI_JoystickClose(joystick);
+            }
+
             SDL_memcpy(&device->joysticks[i], &device->joysticks[i+1], device->num_joysticks - i - 1);
             --device->num_joysticks;
             --SDL_HIDAPI_numjoysticks;