diff --git a/CHANGES b/CHANGES index 6dfc8eeaf..7b5ba565f 100644 --- a/CHANGES +++ b/CHANGES @@ -40,6 +40,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: - Qt: Window size command line options are now supported - Qt: Increase usability of key mapper diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp index 07b5bad50..a84ab1df0 100644 --- a/src/platform/qt/GameController.cpp +++ b/src/platform/qt/GameController.cpp @@ -474,8 +474,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() {