From 025ad53a438bc4f1e656b03f4996aebfb7cf0a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 9 Jul 2025 17:12:01 +0200
Subject: [PATCH] Apply the important parts of the exit fix (#20607)

---
 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 9a12ce5b84..ee4b647d89 100644
--- a/Windows/EmuThread.cpp
+++ b/Windows/EmuThread.cpp
@@ -312,7 +312,6 @@ void MainThreadFunc() {
 		Core_StateProcessed();
 		NativeFrame(graphicsContext);
 	}
-	Core_WaitInactive();
 
 	g_inLoop = false;
 
diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index a095d76e90..a5eb3c8e46 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -1142,8 +1142,8 @@ namespace MainWindow
 
 		case WM_DESTROY:
 			InputDevice::StopPolling();
-			MainThread_Stop();
 			WindowsRawInput::Shutdown();
+			MainThread_Stop();
 			KillTimer(hWnd, TIMER_CURSORUPDATE);
 			KillTimer(hWnd, TIMER_CURSORMOVEUPDATE);
 			// Main window is gone, this tells the message loop to exit.