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

Free the joystick player index when the joystick is removed

This commit is contained in:
Sam Lantinga 2020-01-13 15:35:54 -08:00
parent 1d321850b6
commit 3a796d6a58
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/joystick/SDL_joystick.c
View File

@ -158,8 +158,8 @@ SDL_SetJoystickIDForPlayerIndex(int player_index, SDL_JoystickID instance_id)
} }
SDL_joystick_players = new_players; 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_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_player_count = player_index + 1;
} }
SDL_joystick_players[player_index] = instance_id; SDL_joystick_players[player_index] = instance_id;
@ -947,6 +947,7 @@ static void UpdateEventsForDeviceRemoval()
void SDL_PrivateJoystickRemoved(SDL_JoystickID device_instance) void SDL_PrivateJoystickRemoved(SDL_JoystickID device_instance)
{ {
SDL_Joystick *joystick; SDL_Joystick *joystick;
int player_index;
#if !SDL_EVENTS_DISABLED #if !SDL_EVENTS_DISABLED
SDL_Event event; SDL_Event event;
@ -969,6 +970,13 @@ void SDL_PrivateJoystickRemoved(SDL_JoystickID device_instance)
break; break;
} }
} }
SDL_LockJoysticks();
player_index = SDL_GetPlayerIndexForJoystickID(device_instance);
if (player_index >= 0) {
SDL_joystick_players[player_index] = -1;
}
SDL_UnlockJoysticks();
} }
int int

3
src/joystick/hidapi/SDL_hidapi_xbox360w.c
View File

@ -245,9 +245,6 @@ HIDAPI_DriverXbox360W_UpdateDevice(SDL_HIDAPI_Device *device)
HIDAPI_JoystickConnected(device, &joystickID); HIDAPI_JoystickConnected(device, &joystickID);
/* Set the controller LED */
SetSlotLED(device->dev, joystickID);
} else if (device->num_joysticks > 0) { } else if (device->num_joysticks > 0) {
HIDAPI_JoystickDisconnected(device, device->joysticks[0]); HIDAPI_JoystickDisconnected(device, device->joysticks[0]);
} }