Qt: Fix resetting while paused

This commit is contained in:
Jeffrey Pfau 2015-12-15 22:13:19 -08:00
parent b111f0eb5e
commit 6dbe1f10f2
2 changed files with 8 additions and 0 deletions

View File

@ -26,6 +26,7 @@ Bugfixes:
- ARM7: Fix bank switching with LDR[B]T/STR[B]T
- Qt: Fix crash when closing multiplayer windows
- GBA Video: Fix OAM and palette initialization
- Qt: Fix resetting while paused
Misc:
- GBA Audio: Implement missing flags on SOUNDCNT_X register
- Qt: Add mute option to menu

View File

@ -478,8 +478,15 @@ void GameController::setPaused(bool paused) {
}
void GameController::reset() {
if (!m_gameOpen) {
return;
}
bool wasPaused = isPaused();
setPaused(false);
GBAThreadReset(&m_threadContext);
if (wasPaused) {
setPaused(true);
}
}
void GameController::threadInterrupt() {