mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 11:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed double SDL_EVENT_GAMEPAD_ADDED for controllers with automatic gamepad mappings

Browse Source 
(cherry picked from commit 6babade758)
This commit is contained in:
Sam Lantinga
2025-07-24 10:34:44 -07:00
parent 4210aa61e1
commit b78c61d67a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/joystick/SDL_gamepad.c
View File

@@ -311,7 +311,7 @@ void SDL_PrivateGamepadAdded(SDL_JoystickID instance_id)
{ {
SDL_Event event; SDL_Event event;
if (!SDL_gamepads_initialized) { if (!SDL_gamepads_initialized || SDL_IsJoystickBeingAdded()) {
return; return;
} }

6
src/joystick/SDL_joystick.c
View File

@@ -2143,6 +2143,7 @@ void SDL_PrivateJoystickAdded(SDL_JoystickID instance_id)
SDL_JoystickDriver *driver; SDL_JoystickDriver *driver;
int device_index; int device_index;
int player_index = -1; int player_index = -1;
bool is_gamepad;
SDL_AssertJoysticksLocked(); SDL_AssertJoysticksLocked();
@@ -2177,9 +2178,12 @@ void SDL_PrivateJoystickAdded(SDL_JoystickID instance_id)
} }
} }
// This might create an automatic gamepad mapping, so wait to send the event
is_gamepad = SDL_IsGamepad(instance_id);
SDL_joystick_being_added = false; SDL_joystick_being_added = false;
if (SDL_IsGamepad(instance_id)) { if (is_gamepad) {
SDL_PrivateGamepadAdded(instance_id); SDL_PrivateGamepadAdded(instance_id);
} }
} }