all repos — mgba @ edd604b7005164e627546623a7c486fab452c117

mGBA Game Boy Advance Emulator

Qt: Fix resetting while paused
Jeffrey Pfau jeffrey@endrift.com
Tue, 15 Dec 2015 22:13:19 -0800
commit

edd604b7005164e627546623a7c486fab452c117

parent

d074967ed8a231e2d0c3dc18f14e274ba36ef231

2 files changed, 8 insertions(+), 0 deletions(-)

jump to
M CHANGESCHANGES

@@ -40,6 +40,7 @@ - ARM7: Implement undefined STRH/LDRH/LDRSH/LDRSB versions

- 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: - Qt: Window size command line options are now supported - Qt: Increase usability of key mapper
M src/platform/qt/GameController.cppsrc/platform/qt/GameController.cpp

@@ -474,8 +474,15 @@ }

} void GameController::reset() { + if (!m_gameOpen) { + return; + } + bool wasPaused = isPaused(); setPaused(false); GBAThreadReset(&m_threadContext); + if (wasPaused) { + setPaused(true); + } } void GameController::threadInterrupt() {