Browse Source

Don't bother calling SDL_SYS_HapticEffectType() at all for XInput devices.

Ryan C. Gordon 11 years ago
parent
commit
54dce3f53a
1 changed files with 6 additions and 3 deletions
  1. 6 3
      src/haptic/windows/SDL_syshaptic.c

+ 6 - 3
src/haptic/windows/SDL_syshaptic.c

@@ -1202,10 +1202,13 @@ SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
                         SDL_HapticEffect * base)
 {
     HRESULT ret;
-    REFGUID type = SDL_SYS_HapticEffectType(base);
+    REFGUID type = NULL;
 
-    if ((type == NULL) && (!haptic->hwdata->bXInputHaptic)) {
-        goto err_hweffect;
+    if (!haptic->hwdata->bXInputHaptic) {
+        type = SDL_SYS_HapticEffectType(base);
+        if (type == NULL) {
+            goto err_hweffect;
+        }
     }
 
     /* Alloc the effect. */