From b4999975db925e6ca51b53a2be0bd264c978fcb2 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Tue, 23 Apr 2024 14:44:08 +1000
Subject: [PATCH] System: Fix pause-on-start running unthrottled

---
 src/core/system.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/core/system.cpp b/src/core/system.cpp
index f528f5254..65bf31c0a 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -1165,8 +1165,6 @@ void System::PauseSystem(bool paused)
     if (g_settings.inhibit_screensaver)
       PlatformMisc::SuspendScreensaver();
 
-    UpdateDisplaySync();
-
     Host::OnSystemResumed();
     Host::OnIdleStateChanged();
 
@@ -1559,10 +1557,8 @@ bool System::BootSystem(SystemBootParameters parameters, Error* error)
   if (g_settings.start_paused || parameters.override_start_paused.value_or(false))
     PauseSystem(true);
 
+  UpdateSpeedLimiterState();
   ResetPerformanceCounters();
-  if (IsRunning())
-    UpdateSpeedLimiterState();
-
   return true;
 }
 
@@ -2795,9 +2791,7 @@ void System::UpdateSpeedLimiterState()
     ResetThrottler();
   }
 
-  // Defer vsync update until we unpause, in case of fullscreen UI.
-  if (IsRunning())
-    UpdateDisplaySync();
+  UpdateDisplaySync();
 
   if (g_settings.increase_timer_resolution)
     SetTimerResolutionIncreased(s_throttler_enabled);