ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix resetting while paused

This commit is contained in:
Jeffrey Pfau 2015-12-15 22:13:19 -08:00
parent d074967ed8
commit edd604b700
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -40,6 +40,7 @@ Bugfixes:
- ARM7: Fix bank switching with LDR[B]T/STR[B]T - ARM7: Fix bank switching with LDR[B]T/STR[B]T
- Qt: Fix crash when closing multiplayer windows - Qt: Fix crash when closing multiplayer windows
- GBA Video: Fix OAM and palette initialization - GBA Video: Fix OAM and palette initialization
- Qt: Fix resetting while paused
Misc: Misc:
- Qt: Window size command line options are now supported - Qt: Window size command line options are now supported
- Qt: Increase usability of key mapper - Qt: Increase usability of key mapper

7
src/platform/qt/GameController.cpp
View File

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