From cd2d0503da34816c2866b35f95c3e8703a336d06 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Thu, 10 Jul 2025 12:43:23 +1000
Subject: [PATCH] System: Fix frame advance+runahead stepping 2 frames

---
 src/core/system.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/system.cpp b/src/core/system.cpp
index aad8f03ea..cbd20ee42 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -2192,9 +2192,11 @@ void System::FrameDone()
   {
     Host::PumpMessagesOnCPUThread();
     InputManager::PollSources();
-    CheckForAndExitExecution();
   }
 
+  // Frame step can still trigger exit
+  CheckForAndExitExecution();
+
   // Update input OSD if we're running
   if (g_settings.display_show_inputs)
     ImGuiManager::UpdateInputOverlay();