commit 6e60adbf5b4d2f02475e231553149c2f9cc97acf
author Lucas Zawacki <lfzawacki@gmail.com> Mon Jul 16 14:05:39 2012 -0300
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 16 19:35:44 2012 +0200
tree c910b48c474ec9b61e63a2a1e29aadd960e5ca20
parent cbd83d0307d601e3a0689e0e8b836b3b6afb89ca

joy.cpl: Correct joystick testing thread behavior.

dlls/joy.cpl/main.c

diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index eb8f982..e9b3a72 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -424,9 +424,11 @@
                 }
                 break;
 
-                case PSN_RESET:
+                case PSN_RESET: /* intentional fall-through */
+                case PSN_KILLACTIVE:
                     /* Stop input thread */
                     data->stop = TRUE;
+                    MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, 0);
                     CloseHandle(thread);
                 break;
             }