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

Don't overwrite non-CRC gamepad mapping with a new mapping that specifies a CRC

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/11723

(cherry picked from commit 1413bfb185)
This commit is contained in:
Sam Lantinga
2024-12-26 20:18:26 -08:00
parent 348bb53cc1
commit ddfdb0ca7b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/joystick/SDL_gamecontroller.c
View File

@@ -688,7 +688,7 @@ static ControllerMapping_t *SDL_CreateMappingForWGIController(SDL_JoystickGUID g
/* /*
* Helper function to scan the mappings database for a controller with the specified GUID * Helper function to scan the mappings database for a controller with the specified GUID
*/ */
static ControllerMapping_t *SDL_PrivateMatchControllerMappingForGUID(SDL_JoystickGUID guid, SDL_bool match_version) static ControllerMapping_t *SDL_PrivateMatchControllerMappingForGUID(SDL_JoystickGUID guid, SDL_bool match_version, SDL_bool exact_match_crc)
{ {
ControllerMapping_t *mapping, *best_match = NULL; ControllerMapping_t *mapping, *best_match = NULL;
Uint16 crc = 0; Uint16 crc = 0;
@@ -728,9 +728,10 @@ static ControllerMapping_t *SDL_PrivateMatchControllerMappingForGUID(SDL_Joystic
/* An exact match, including CRC */ /* An exact match, including CRC */
return mapping; return mapping;
} else if (crc && exact_match_crc) {
return NULL;
} }
if (!best_match) { if (!best_match) {
best_match = mapping; best_match = mapping;
} }
@@ -746,7 +747,7 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickG
{ {
ControllerMapping_t *mapping; ControllerMapping_t *mapping;
mapping = SDL_PrivateMatchControllerMappingForGUID(guid, SDL_TRUE); mapping = SDL_PrivateMatchControllerMappingForGUID(guid, SDL_TRUE, adding_mapping);
if (mapping) { if (mapping) {
return mapping; return mapping;
} }
@@ -760,7 +761,7 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickG
if (SDL_JoystickGUIDUsesVersion(guid)) { if (SDL_JoystickGUIDUsesVersion(guid)) {
/* Try again, ignoring the version */ /* Try again, ignoring the version */
mapping = SDL_PrivateMatchControllerMappingForGUID(guid, SDL_FALSE); mapping = SDL_PrivateMatchControllerMappingForGUID(guid, SDL_FALSE, SDL_FALSE);
if (mapping) { if (mapping) {
return mapping; return mapping;
} }