Merge pull request #10457 from Pokechu22/movie-no-pause-menubar-desync

Fix menu bar becoming desynced when Pause at End of Movie is disabled
dolphin-emu · Feb 18, 2022 · 1e126d2 · 1e126d2
2 parents 5077599 + a81b44f
commit 1e126d2
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
@@ -1324,7 +1324,7 @@ void EndPlayInput(bool cont)
   {
     // We can be called by EmuThread during boot (CPU::State::PowerDown)
     bool was_running = Core::IsRunningAndStarted() && !CPU::IsStepping();
-    if (was_running)
+    if (was_running && Config::Get(Config::MAIN_MOVIE_PAUSE_MOVIE))
       CPU::Break();
     s_rerecords = 0;
     s_currentByte = 0;
@@ -1337,11 +1337,7 @@ void EndPlayInput(bool cont)
     // delete tmpInput;
     // tmpInput = nullptr;
 
-    Core::QueueHostJob([=] {
-      Core::UpdateWantDeterminism();
-      if (was_running && !Config::Get(Config::MAIN_MOVIE_PAUSE_MOVIE))
-        CPU::EnableStepping(false);
-    });
+    Core::QueueHostJob([=] { Core::UpdateWantDeterminism(); });
   }
 }