From 5e55090e67da907bc016eda2eae7b97ba428da5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 9 Jul 2025 12:13:18 +0200
Subject: [PATCH] Windows: Fix a hang during shutdown, could leave behind a
 running process.

---
 Windows/EmuThread.cpp  | 1 -
 Windows/MainWindow.cpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp
index 4ce78cfdcd..c18450c007 100644
--- a/Windows/EmuThread.cpp
+++ b/Windows/EmuThread.cpp
@@ -298,7 +298,6 @@ void MainThreadFunc() {
 		Core_StateProcessed();
 		NativeFrame(graphicsContext);
 	}
-	Core_WaitInactive();
 
 	g_inLoop = false;
 
diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index b448a1de85..10a1778099 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -929,9 +929,9 @@ namespace MainWindow
 		case WM_DESTROY:
 			g_InputManager.StopPolling();
 			g_InputManager.Shutdown();
+			WindowsRawInput::Shutdown();
 
 			MainThread_Stop();
-			WindowsRawInput::Shutdown();
 			KillTimer(hWnd, TIMER_CURSORUPDATE);
 			KillTimer(hWnd, TIMER_CURSORMOVEUPDATE);
 			// Main window is gone, this tells the message loop to exit.