diff options
| author | Matthew Parlane <parlane@gmail.com> | 2016-07-13 18:54:51 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-13 18:54:51 +1200 |
| commit | ebf10d38ddc7367a4debb9987c0ef7f6ff152a12 (patch) | |
| tree | 0d3eedcb373e3cd718b5134213222591208b16b4 /Source | |
| parent | 4d2df0a8cee1b11a3dca8f41edaafda69ee262dc (diff) | |
| parent | b6eb5c25d1265ede39711fbd525d0c461bf41522 (diff) | |
Merge pull request #3978 from JosJuice/frameskipping-determinism
Movie: Fix FrameSkipping determinism condition
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/Movie.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index b3ddec67d4..1f4fface23 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -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); |