joy.cpl: Correct joystick testing thread behavior.

6e60adbf · Lucas Zawacki · Alexandre Julliard · cbd83d03 · 6e60adbf
Commit 6e60adbf authored Jul 16, 2012 by Lucas Zawacki Committed by Alexandre Julliard Jul 16, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

main.c dlls/joy.cpl/main.c +3 -1

No files found.
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -424,9 +424,11 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM 
                }
                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;
            }