From 38619bb28db83bc5844d13d99b3072496adcd498 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 24 Jun 2023 15:38:38 -0700 Subject: [PATCH] SDL_FindFreePlayerIndex() will always return the next available player index Fixes https://github.com/libsdl-org/SDL/issues/7868 (cherry picked from commit 87e916dd214866af9cfd67eb4618918bc8b0f1b4) --- src/joystick/SDL_joystick.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c index 5e46bc15c..12965f934 100644 --- a/src/joystick/SDL_joystick.c +++ b/src/joystick/SDL_joystick.c @@ -221,10 +221,10 @@ static int SDL_FindFreePlayerIndex() for (player_index = 0; player_index < SDL_joystick_player_count; ++player_index) { if (SDL_joystick_players[player_index] == -1) { - return player_index; + break; } } - return -1; + return player_index; } static int SDL_GetPlayerIndexForJoystickID(SDL_JoystickID instance_id)