|
@@ -1391,9 +1391,6 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForNameAndGUID(const
|
|
|
}
|
|
|
#endif /* __LINUX__ */
|
|
|
|
|
|
- if (!mapping) {
|
|
|
- mapping = s_pDefaultMapping;
|
|
|
- }
|
|
|
return mapping;
|
|
|
}
|
|
|
|
|
@@ -1506,6 +1503,9 @@ static ControllerMapping_t *SDL_PrivateGetControllerMapping(int device_index)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (!mapping) {
|
|
|
+ mapping = s_pDefaultMapping;
|
|
|
+ }
|
|
|
return mapping;
|
|
|
}
|
|
|
|
|
@@ -2059,7 +2059,7 @@ SDL_bool SDL_IsGameControllerNameAndGUID(const char *name, SDL_JoystickGUID guid
|
|
|
|
|
|
SDL_LockJoysticks();
|
|
|
{
|
|
|
- if (SDL_PrivateGetControllerMappingForNameAndGUID(name, guid) != NULL) {
|
|
|
+ if (s_pDefaultMapping || SDL_PrivateGetControllerMappingForNameAndGUID(name, guid) != NULL) {
|
|
|
retval = SDL_TRUE;
|
|
|
} else {
|
|
|
retval = SDL_FALSE;
|