Qt: Fix resetting while paused
Jeffrey Pfau jeffrey@endrift.com
Tue, 15 Dec 2015 22:13:19 -0800
2 files changed,
8 insertions(+),
0 deletions(-)
M
CHANGES
→
CHANGES
@@ -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.cpp
→
src/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() {