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

Only use the default gamepad mapping if an automatic mapping isn't available

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/10162
This commit is contained in:
Sam Lantinga
2024-07-03 11:43:43 -07:00
parent 98f27b8f2e
commit 0f8054cf87
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/joystick/SDL_gamepad.c
View File

@@ -1676,9 +1676,6 @@ static GamepadMapping_t *SDL_PrivateGetGamepadMappingForNameAndGUID(const char *
} }
#endif /* SDL_PLATFORM_LINUX */ #endif /* SDL_PLATFORM_LINUX */
if (!mapping) {
mapping = s_pDefaultMapping;
}
return mapping; return mapping;
} }
@@ -1793,6 +1790,9 @@ static GamepadMapping_t *SDL_PrivateGetGamepadMapping(SDL_JoystickID instance_id
} }
} }
if (!mapping) {
mapping = s_pDefaultMapping;
}
return mapping; return mapping;
} }
@@ -2546,7 +2546,7 @@ SDL_bool SDL_IsGamepadNameAndGUID(const char *name, SDL_JoystickGUID guid)
SDL_LockJoysticks(); SDL_LockJoysticks();
{ {
if (SDL_PrivateGetGamepadMappingForNameAndGUID(name, guid) != NULL) { if (s_pDefaultMapping || SDL_PrivateGetGamepadMappingForNameAndGUID(name, guid) != NULL) {
retval = SDL_TRUE; retval = SDL_TRUE;
} else { } else {
retval = SDL_FALSE; retval = SDL_FALSE;