From 54dce3f53ab10402edaa6f241d5c88edb76159e7 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 20 Oct 2013 15:45:48 -0400
Subject: [PATCH] Don't bother calling SDL_SYS_HapticEffectType() at all for
 XInput devices.

---
 src/haptic/windows/SDL_syshaptic.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/haptic/windows/SDL_syshaptic.c b/src/haptic/windows/SDL_syshaptic.c
index f8b9096270565..c8cbd598920af 100644
--- a/src/haptic/windows/SDL_syshaptic.c
+++ b/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. */