commit 6ad79df2529d1a1c50ea97406a4f2fffda1dc087
author Sam Lantinga <slouken@libsdl.org> Mon Jan 13 15:35:54 2020 -0800
committer Sam Lantinga <slouken@libsdl.org> Mon Jan 13 15:35:54 2020 -0800
tree d24be411888a128b92fec57ffbddb9c45451839a
parent ed187bc10247ed4f1d142382948815e4942a1f7e

Free the joystick player index when the joystick is removed

src/joystick/SDL_joystick.c

diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index 93772ec..2868cc5 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -158,8 +158,8 @@
         }
 
         SDL_joystick_players = new_players;
-		SDL_memset(&SDL_joystick_players[SDL_joystick_player_count], 0xFF, (player_index - SDL_joystick_player_count + 1) * sizeof(SDL_joystick_players[0]));
-		SDL_joystick_player_count = player_index + 1;
+        SDL_memset(&SDL_joystick_players[SDL_joystick_player_count], 0xFF, (player_index - SDL_joystick_player_count + 1) * sizeof(SDL_joystick_players[0]));
+        SDL_joystick_player_count = player_index + 1;
     }
 
     SDL_joystick_players[player_index] = instance_id;
@@ -947,6 +947,7 @@
 void SDL_PrivateJoystickRemoved(SDL_JoystickID device_instance)
 {
     SDL_Joystick *joystick;
+    int player_index;
 
 #if !SDL_EVENTS_DISABLED
     SDL_Event event;
@@ -969,6 +970,13 @@
             break;
         }
     }
+
+    SDL_LockJoysticks();
+    player_index = SDL_GetPlayerIndexForJoystickID(device_instance);
+    if (player_index >= 0) {
+        SDL_joystick_players[player_index] = -1;
+    }
+    SDL_UnlockJoysticks();
 }
 
 int

src/joystick/hidapi/SDL_hidapi_xbox360w.c

diff --git a/src/joystick/hidapi/SDL_hidapi_xbox360w.c b/src/joystick/hidapi/SDL_hidapi_xbox360w.c
index a87ff9d..4800625 100644
--- a/src/joystick/hidapi/SDL_hidapi_xbox360w.c
+++ b/src/joystick/hidapi/SDL_hidapi_xbox360w.c
@@ -245,9 +245,6 @@
 
                     HIDAPI_JoystickConnected(device, &joystickID);
 
-                    /* Set the controller LED */
-                    SetSlotLED(device->dev, joystickID);
-
                 } else if (device->num_joysticks > 0) {
                     HIDAPI_JoystickDisconnected(device, device->joysticks[0]);
                 }