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 #3415 from rabbott99/movie-end-pause 

Movie: Fix "Pause at End of Movie" for wii games
This commit is contained in:
skidau 2016-01-02 09:08:06 +11:00
parent 988f62dfb1 d2ef903d1a
commit 96d8ea5537
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,9 +228,6 @@ void InputUpdate()
s_totalTickCount += CoreTiming::GetTicks() - s_tickCountAtLastInput; s_totalTickCount += CoreTiming::GetTicks() - s_tickCountAtLastInput;
s_tickCountAtLastInput = CoreTiming::GetTicks(); 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) void SetFrameSkipping(unsigned int framesToSkip)
@ -1205,6 +1202,9 @@ void EndPlayInput(bool cont)
//g_totalFrames = s_totalBytes = 0; //g_totalFrames = s_totalBytes = 0;
//delete tmpInput; //delete tmpInput;
//tmpInput = nullptr; //tmpInput = nullptr;
if (SConfig::GetInstance().m_PauseMovie)
Core::SetState(Core::CORE_PAUSE);
} }
} }