Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix menu bar becoming desynced when Pause at End of Movie is disabled #10457

Merged
merged 1 commit into from
Feb 18, 2022
Merged

Fix menu bar becoming desynced when Pause at End of Movie is disabled #10457

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions Source/Core/Core/Movie.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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(); });
}
}

Expand Down