encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Ryan C. Gordon 2013-10-20 16:03:11 -04:00
parent c521ae84bc
commit f28c7fe8a5
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/haptic/windows/SDL_syshaptic.c
View File

@ -1204,14 +1204,11 @@ 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);
if (type == NULL) {
goto err_hweffect; goto err_hweffect;
} }
}
/* Alloc the effect. */ /* Alloc the effect. */
effect->hweffect = (struct haptic_hweffect *) effect->hweffect = (struct haptic_hweffect *)