mirrors
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't clobber an existing entry with a different version when adding a gamepad mapping

This commit is contained in:
Sam Lantinga 2023-03-01 16:38:48 -08:00
parent 9e14559e80
commit 727c7d4e2f
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/joystick/SDL_gamepad.c
View File

@ -772,7 +772,7 @@ static GamepadMapping_t *SDL_PrivateMatchGamepadMappingForGUID(SDL_JoystickGUID
/* /*
* Helper function to scan the mappings database for a gamepad with the specified GUID * Helper function to scan the mappings database for a gamepad with the specified GUID
*/ */
static GamepadMapping_t *SDL_PrivateGetGamepadMappingForGUID(SDL_JoystickGUID guid, SDL_bool create_mapping) static GamepadMapping_t *SDL_PrivateGetGamepadMappingForGUID(SDL_JoystickGUID guid, SDL_bool adding_mapping)
{ {
GamepadMapping_t *mapping; GamepadMapping_t *mapping;
Uint16 vendor, product, crc; Uint16 vendor, product, crc;
@ -792,6 +792,13 @@ static GamepadMapping_t *SDL_PrivateGetGamepadMappingForGUID(SDL_JoystickGUID gu
return mapping; return mapping;
} }
if (adding_mapping) {
/* We didn't find an existing mapping */
return NULL;
}
/* Try harder to get the best match, or create a mapping */
if (vendor && product) { if (vendor && product) {
/* Try again, ignoring the version */ /* Try again, ignoring the version */
if (crc) { if (crc) {
@ -807,30 +814,24 @@ static GamepadMapping_t *SDL_PrivateGetGamepadMappingForGUID(SDL_JoystickGUID gu
} }
} }
if (!create_mapping) {
return NULL;
}
#if SDL_JOYSTICK_XINPUT #if SDL_JOYSTICK_XINPUT
if (SDL_IsJoystickXInput(guid)) { if (SDL_IsJoystickXInput(guid)) {
/* This is an XInput device */ /* This is an XInput device */
return s_pXInputMapping; return s_pXInputMapping;
} }
#endif #endif
if (mapping == NULL) { if (SDL_IsJoystickHIDAPI(guid)) {
if (SDL_IsJoystickHIDAPI(guid)) { mapping = SDL_CreateMappingForHIDAPIGamepad(guid);
mapping = SDL_CreateMappingForHIDAPIGamepad(guid); } else if (SDL_IsJoystickRAWINPUT(guid)) {
} else if (SDL_IsJoystickRAWINPUT(guid)) { mapping = SDL_CreateMappingForRAWINPUTGamepad(guid);
mapping = SDL_CreateMappingForRAWINPUTGamepad(guid); } else if (SDL_IsJoystickWGI(guid)) {
} else if (SDL_IsJoystickWGI(guid)) { mapping = SDL_CreateMappingForWGIGamepad(guid);
mapping = SDL_CreateMappingForWGIGamepad(guid); } else if (SDL_IsJoystickVIRTUAL(guid)) {
} else if (SDL_IsJoystickVIRTUAL(guid)) { /* We'll pick up a robust mapping in VIRTUAL_JoystickGetGamepadMapping */
/* We'll pick up a robust mapping in VIRTUAL_JoystickGetGamepadMapping */
#ifdef __ANDROID__ #ifdef __ANDROID__
} else { } else {
mapping = SDL_CreateMappingForAndroidGamepad(guid); mapping = SDL_CreateMappingForAndroidGamepad(guid);
#endif #endif
}
} }
return mapping; return mapping;
} }
@ -1278,7 +1279,7 @@ static GamepadMapping_t *SDL_PrivateAddMappingForGUID(SDL_JoystickGUID jGUID, co
} }
} }
pGamepadMapping = SDL_PrivateGetGamepadMappingForGUID(jGUID, SDL_FALSE); pGamepadMapping = SDL_PrivateGetGamepadMappingForGUID(jGUID, SDL_TRUE);
if (pGamepadMapping) { if (pGamepadMapping) {
/* Only overwrite the mapping if the priority is the same or higher. */ /* Only overwrite the mapping if the priority is the same or higher. */
if (pGamepadMapping->priority <= priority) { if (pGamepadMapping->priority <= priority) {
@ -1340,7 +1341,7 @@ static GamepadMapping_t *SDL_PrivateGetGamepadMappingForNameAndGUID(const char *
SDL_AssertJoysticksLocked(); SDL_AssertJoysticksLocked();
mapping = SDL_PrivateGetGamepadMappingForGUID(guid, SDL_TRUE); mapping = SDL_PrivateGetGamepadMappingForGUID(guid, SDL_FALSE);
#ifdef __LINUX__ #ifdef __LINUX__
if (mapping == NULL && name) { if (mapping == NULL && name) {
if (SDL_strstr(name, "Xbox 360 Wireless Receiver")) { if (SDL_strstr(name, "Xbox 360 Wireless Receiver")) {
@ -1772,7 +1773,7 @@ char *SDL_GetGamepadMappingForGUID(SDL_JoystickGUID guid)
SDL_LockJoysticks(); SDL_LockJoysticks();
{ {
GamepadMapping_t *mapping = SDL_PrivateGetGamepadMappingForGUID(guid, SDL_TRUE); GamepadMapping_t *mapping = SDL_PrivateGetGamepadMappingForGUID(guid, SDL_FALSE);
if (mapping) { if (mapping) {
retval = CreateMappingString(mapping, guid); retval = CreateMappingString(mapping, guid);
} else { } else {