pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backed out hg changeset b92b8c52946c. REFGUID is apparently a const type.

Browse source
This commit is contained in:
Ryan C. Gordon 2013-10-20 16:03:11 -04:00
parent ed8a935593
commit e9b771e52a
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/haptic/windows/SDL_syshaptic.c
View file

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