mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-10 16:19:28 +01:00
Merge pull request #3415 from rabbott99/movie-end-pause
Movie: Fix "Pause at End of Movie" for wii games
This commit is contained in:
commit
96d8ea5537
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user