# HG changeset patch
# User Edgar Simo <bobbens@gmail.com>
# Date 1219659261 0
# Node ID 336b604ec15be45c67b251b8de1cf19d5fd809b8
# Parent  1d1be6137875c05c7174f862b792107addcc2070
Merging another last minute fix from force feedback branch (r4036)

diff -r 1d1be6137875 -r 336b604ec15b src/haptic/win32/SDL_syshaptic.c
--- a/src/haptic/win32/SDL_syshaptic.c	Mon Aug 25 10:04:06 2008 +0000
+++ b/src/haptic/win32/SDL_syshaptic.c	Mon Aug 25 10:14:21 2008 +0000
@@ -1374,7 +1374,7 @@
  * Stops all the playing effects on the device.
  */
 int
-SDL_SYS_HapticUnpause(SDL_Haptic * haptic)
+SDL_SYS_HapticStopAll(SDL_Haptic * haptic)
 {
     HRESULT ret;