From f607f4144090e95bbfd1992dae82df329e8b4070 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 3 Dec 2017 07:38:29 -0800 Subject: [PATCH] Windows: Stop input poll before emu shutdown. Otherwise, we could crash in the input thread during host deletion. --- Windows/MainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index ba507b916f..95edbb155f 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -859,8 +859,8 @@ namespace MainWindow break; case WM_CLOSE: - EmuThread_Stop(); InputDevice::StopPolling(); + EmuThread_Stop(); WindowsRawInput::Shutdown(); return DefWindowProc(hWnd,message,wParam,lParam);