Browse Source

Patched to compile on Windows.

Ryan C. Gordon 10 years ago
parent
commit
78026f5492
1 changed files with 5 additions and 5 deletions
  1. 5 5
      src/joystick/windows/SDL_dinputjoystick.c

+ 5 - 5
src/joystick/windows/SDL_dinputjoystick.c

@@ -340,16 +340,16 @@ EnumJoysticksCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext)
 {
     JoyStick_DeviceData *pNewJoystick;
     JoyStick_DeviceData *pPrevJoystick = NULL;
-
-    if (SDL_IsXInputDevice(&pdidInstance->guidProduct)) {
-        return DIENUM_CONTINUE;  /* ignore XInput devices here, keep going. */
-    }
-
     const DWORD devtype = (pdidInstance->dwDevType & 0xFF);
+
     if ((devtype != DI8DEVTYPE_JOYSTICK) && (devtype != DI8DEVTYPE_GAMEPAD)) {
         return DIENUM_CONTINUE;  /* Ignore touchpads, etc. */
     }
 
+    if (SDL_IsXInputDevice(&pdidInstance->guidProduct)) {
+        return DIENUM_CONTINUE;  /* ignore XInput devices here, keep going. */
+    }
+
     pNewJoystick = *(JoyStick_DeviceData **)pContext;
     while (pNewJoystick) {
         if (!SDL_memcmp(&pNewJoystick->dxdevice.guidInstance, &pdidInstance->guidInstance, sizeof(pNewJoystick->dxdevice.guidInstance))) {