This file is part of MXE. See index.html for further information. diff -ruN SDL2-2.0.0.orig/src/haptic/windows/SDL_syshaptic.c SDL2-2.0.0/src/haptic/windows/SDL_syshaptic.c --- SDL2-2.0.0.orig/src/haptic/windows/SDL_syshaptic.c 2013-05-28 06:45:30.000000000 +0200 +++ SDL2-2.0.0/src/haptic/windows/SDL_syshaptic.c 2013-06-26 22:27:32.334199192 +0200 @@ -657,7 +657,7 @@ if ((SDL_hapticlist[i].bXInputHaptic) && (SDL_hapticlist[i].userid == userid)) { SDL_assert(joystick->hwdata->bXInputHaptic); haptic->index = i; - break; + return SDL_SYS_HapticOpenFromXInput(haptic, SDL_hapticlist[haptic->index].userid); } } } else {