Merge pull request #20510 from hrydgard/more-fixes

Fix bug in Win32 debugger, misc fixes

Windows/EmuThread.cpp

@@ -300,7 +300,7 @@ void MainThreadFunc() {
 		while (GetUIState() != UISTATE_EXIT) {  //  && GetUIState() != UISTATE_EXCEPTION
 			// We're here again, so the game quit.  Restart Run() which controls the UI.
 			// This way they can load a new game.
-			if (!Core_IsActive())
+			if (!(Core_IsActive() || Core_IsStepping()))
 				UpdateUIState(UISTATE_MENU);
 			Core_StateProcessed();
 			NativeFrame(graphicsContext);