ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Fix menu bar becoming desynced when Pause at End of Movie is disabled
This commit is contained in:
Mai M 2022-02-18 09:59:32 -05:00 committed by GitHub
parent 5077599679 a81b44f697
commit 1e126d23e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Movie.cpp
View File

@ -1324,7 +1324,7 @@ void EndPlayInput(bool cont)
{ {
// We can be called by EmuThread during boot (CPU::State::PowerDown) // We can be called by EmuThread during boot (CPU::State::PowerDown)
bool was_running = Core::IsRunningAndStarted() && !CPU::IsStepping(); bool was_running = Core::IsRunningAndStarted() && !CPU::IsStepping();
if (was_running) if (was_running && Config::Get(Config::MAIN_MOVIE_PAUSE_MOVIE))
CPU::Break(); CPU::Break();
s_rerecords = 0; s_rerecords = 0;
s_currentByte = 0; s_currentByte = 0;
@ -1337,11 +1337,7 @@ void EndPlayInput(bool cont)
// delete tmpInput; // delete tmpInput;
// tmpInput = nullptr; // tmpInput = nullptr;
Core::QueueHostJob([=] { Core::QueueHostJob([=] { Core::UpdateWantDeterminism(); });
Core::UpdateWantDeterminism();
if (was_running && !Config::Get(Config::MAIN_MOVIE_PAUSE_MOVIE))
CPU::EnableStepping(false);
});
} }
} }