diff options
| author | skidau <skidau@gmail.com> | 2016-01-02 09:08:06 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2016-01-02 09:08:06 +1100 |
| commit | 96d8ea55373c3d8624ca3c6b5c51d8a5331d81df (patch) | |
| tree | 7fa99735ff779e025d8713e6c6395c8af61c8630 /Source/Core | |
| parent | 988f62dfb1d7ce3c86d79e8aa1dcb4fae55852fb (diff) | |
| parent | d2ef903d1af4a82d2a129809a55540300c108a85 (diff) | |
Merge pull request #3415 from rabbott99/movie-end-pause
Movie: Fix "Pause at End of Movie" for wii games
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Movie.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index 4d0c806aa5..06024e0eb2 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -228,9 +228,6 @@ void InputUpdate() s_totalTickCount += CoreTiming::GetTicks() - s_tickCountAtLastInput; s_tickCountAtLastInput = CoreTiming::GetTicks(); } - - if (IsPlayingInput() && g_currentInputCount == (g_totalInputCount - 1) && SConfig::GetInstance().m_PauseMovie) - Core::SetState(Core::CORE_PAUSE); } void SetFrameSkipping(unsigned int framesToSkip) @@ -1205,6 +1202,9 @@ void EndPlayInput(bool cont) //g_totalFrames = s_totalBytes = 0; //delete tmpInput; //tmpInput = nullptr; + + if (SConfig::GetInstance().m_PauseMovie) + Core::SetState(Core::CORE_PAUSE); } } |