Backed out hg changeset add2dbe99fe2. REFGUID is apparently a const t…

…ype.
libsdl-org · Oct 20, 2013 · f28c7fe · f28c7fe
1 parent c521ae8
commit f28c7fe
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/haptic/windows/SDL_syshaptic.c b/src/haptic/windows/SDL_syshaptic.c
@@ -1204,13 +1204,10 @@ SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
                         SDL_HapticEffect * base)
 {
     HRESULT ret;
-    REFGUID type = NULL;
+    REFGUID type = SDL_SYS_HapticEffectType(base);
 
-    if (!haptic->hwdata->bXInputHaptic) {
-        type = SDL_SYS_HapticEffectType(base);
-        if (type == NULL) {
-            goto err_hweffect;
-        }
+    if ((type == NULL) && (!haptic->hwdata->bXInputHaptic)) {
+        goto err_hweffect;
     }
 
     /* Alloc the effect. */