winmm: Allow calling joyReleaseCapture multiple times.

3db2e911 · Bruno Jesus · Alexandre Julliard · 45f46bd3 · 3db2e911
Commit 3db2e911 authored Dec 11, 2014 by Bruno Jesus Committed by Alexandre Julliard Dec 11, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

joystick.c dlls/winmm/joystick.c +8 -5

No files found.
--- a/dlls/winmm/joystick.c
+++ b/dlls/winmm/joystick.c
@@ -279,11 +279,14 @@ MMRESULT WINAPI joyReleaseCapture(UINT wID)

    if (wID >= MAXJOYSTICK)		return JOYERR_PARMS;
    if (!JOY_LoadDriver(wID))		return MMSYSERR_NODRIVER;
-    if (!JOY_Sticks[wID].hCapture)	return JOYERR_NOCANDO;
-
-    KillTimer(JOY_Sticks[wID].hCapture, JOY_Sticks[wID].wTimer);
-    JOY_Sticks[wID].hCapture = 0;
-    JOY_Sticks[wID].wTimer = 0;
+    if (JOY_Sticks[wID].hCapture)
+    {
+        KillTimer(JOY_Sticks[wID].hCapture, JOY_Sticks[wID].wTimer);
+        JOY_Sticks[wID].hCapture = 0;
+        JOY_Sticks[wID].wTimer = 0;
+    }
+    else
+        TRACE("Joystick is not captured, ignoring request.\n");

    return JOYERR_NOERROR;
 }