From 8d578d590f002d1c76cfe88441e39369b62b7d09 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 6 Jun 2025 09:53:15 -0700 Subject: [PATCH] Fixed replacing existing specific gamepad mappings If the first mapping we see doesn't have a CRC, continue looking for another exact CRC match. Fixes testautomation --filter TestVirtualJoystick (cherry picked from commit 582696687386161fee714bc08433f12b4f7aae02) --- src/joystick/SDL_gamepad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/joystick/SDL_gamepad.c b/src/joystick/SDL_gamepad.c index 3fc952090e..7b76c57266 100644 --- a/src/joystick/SDL_gamepad.c +++ b/src/joystick/SDL_gamepad.c @@ -913,7 +913,7 @@ static GamepadMapping_t *SDL_PrivateMatchGamepadMappingForGUID(SDL_GUID guid, bo // An exact match, including CRC return mapping; } else if (crc && exact_match_crc) { - return NULL; + continue; } if (!best_match) {