Merge pull request #3978 from JosJuice/frameskipping-determinism

Movie: Fix FrameSkipping determinism condition
This commit is contained in:
Matthew Parlane 2016-07-13 18:54:51 +12:00 committed by GitHub
commit ebf10d38dd

View File

@ -314,7 +314,7 @@ void SetReadOnly(bool bEnabled)
void FrameSkipping()
{
// Frameskipping will desync movie playback
if (!IsMovieActive() || NetPlay::IsNetPlayRunning())
if (!Core::g_want_determinism)
{
std::lock_guard<std::mutex> lk(cs_frameSkip);