Commit 965a0da90120299df90cbd51cab08a8daf01b309
2013-10-23T15:54:12
Moved a SDL_SetError() call elsewhere to avoid triggering it needlessly. Otherwise, the XInput path would always trigger it in a harmless manner.
diff --git a/src/haptic/windows/SDL_syshaptic.c b/src/haptic/windows/SDL_syshaptic.c
index a9f8d83..1506235 100644
--- a/src/haptic/windows/SDL_syshaptic.c
+++ b/src/haptic/windows/SDL_syshaptic.c
@@ -1190,7 +1190,6 @@ SDL_SYS_HapticEffectType(SDL_HapticEffect * effect)
return &GUID_CustomForce;
default:
- SDL_SetError("Haptic: Unknown effect type.");
return NULL;
}
}
@@ -1207,6 +1206,7 @@ SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
REFGUID type = SDL_SYS_HapticEffectType(base);
if ((type == NULL) && (!haptic->hwdata->bXInputHaptic)) {
+ SDL_SetError("Haptic: Unknown effect type.");
goto err_hweffect;
}