mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-03 08:28:29 +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
This commit is contained in:
Sam Lantinga
2024-12-26 20:18:26 -08:00
parent 948b16533c
commit 1413bfb185
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/joystick/SDL_gamepad.c
View File

@@ -870,7 +870,7 @@ static GamepadMapping_t *SDL_CreateMappingForWGIGamepad(SDL_GUID guid)
/* /*
* 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_PrivateMatchGamepadMappingForGUID(SDL_GUID guid, bool match_version) static GamepadMapping_t *SDL_PrivateMatchGamepadMappingForGUID(SDL_GUID guid, bool match_version, bool exact_match_crc)
{ {
GamepadMapping_t *mapping, *best_match = NULL; GamepadMapping_t *mapping, *best_match = NULL;
Uint16 crc = 0; Uint16 crc = 0;
@@ -909,6 +909,8 @@ static GamepadMapping_t *SDL_PrivateMatchGamepadMappingForGUID(SDL_GUID guid, bo
// 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) {
@@ -926,7 +928,7 @@ static GamepadMapping_t *SDL_PrivateGetGamepadMappingForGUID(SDL_GUID guid, bool
{ {
GamepadMapping_t *mapping; GamepadMapping_t *mapping;
mapping = SDL_PrivateMatchGamepadMappingForGUID(guid, true); mapping = SDL_PrivateMatchGamepadMappingForGUID(guid, true, adding_mapping);
if (mapping) { if (mapping) {
return mapping; return mapping;
} }
@@ -940,7 +942,7 @@ static GamepadMapping_t *SDL_PrivateGetGamepadMappingForGUID(SDL_GUID guid, bool
if (SDL_JoystickGUIDUsesVersion(guid)) { if (SDL_JoystickGUIDUsesVersion(guid)) {
// Try again, ignoring the version // Try again, ignoring the version
mapping = SDL_PrivateMatchGamepadMappingForGUID(guid, false); mapping = SDL_PrivateMatchGamepadMappingForGUID(guid, false, false);
if (mapping) { if (mapping) {
return mapping; return mapping;
} }