Do not spawn SDL_Gamepad mapping on known hidapi devices

If a SDL_Joystick internal lookup manages to define a joystick type that is not gamepad, it should stay as a joystick
libsdl-org · Dec 6, 2024 · aff4f81 · aff4f81
1 parent dac06e0
commit aff4f81
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/joystick/SDL_gamepad.c b/src/joystick/SDL_gamepad.c
@@ -2572,7 +2572,12 @@ bool SDL_IsGamepad(SDL_JoystickID instance_id)
     SDL_LockJoysticks();
     {
         const void *value;
-        if (SDL_FindInHashTable(s_gamepadInstanceIDs, (void *)(uintptr_t)instance_id, &value)) {
+        SDL_JoystickType js_type = SDL_GetJoystickTypeForID(instance_id);
+        if (js_type != SDL_JOYSTICK_TYPE_GAMEPAD && js_type != SDL_JOYSTICK_TYPE_UNKNOWN)
+        {
+            // avoid creating HIDAPI mapping if type is SDL_Joystick knows it is not a game pad
+            result = false;
+        } else if (SDL_FindInHashTable(s_gamepadInstanceIDs, (void *)(uintptr_t)instance_id, &value)) {
             result = (bool)(uintptr_t)value;
         } else {
             if (SDL_PrivateGetGamepadMapping(instance_id, true) != NULL) {