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 #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
parent 4d2df0a8ce b6eb5c25d1
commit ebf10d38dd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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