all repos — mgba @ 065474d14e6a154ff1c768df40dca757ae53468f

mGBA Game Boy Advance Emulator

Qt: Fix crash when attempting to pause if a game is not running
Jeffrey Pfau jeffrey@endrift.com
Fri, 03 Apr 2015 21:07:26 -0700
commit

065474d14e6a154ff1c768df40dca757ae53468f

parent

41b591e501790dcf88d7c533fe1109300eb3c984

2 files changed, 2 insertions(+), 1 deletions(-)

jump to
M CHANGESCHANGES

@@ -61,6 +61,7 @@ - GBA Memory: Fix I cycles that had been moved to ARM7 core

- GBA Memory: Fix cycle counting for 32-bit load/stores - ARM7: Fix cycle counting for loads - Qt: Pause game while open file dialogs are open (fixes #6 on GitHub) + - Qt: Fix crash when attempting to pause if a game is not running Misc: - GBA Audio: Change internal audio sample buffer from 32-bit to 16-bit samples - GBA Memory: Simplify memory API and use fixed bus width
M src/platform/qt/GameController.cppsrc/platform/qt/GameController.cpp

@@ -334,7 +334,7 @@ return GBAThreadIsPaused(&m_threadContext);

} void GameController::setPaused(bool paused) { - if (paused == GBAThreadIsPaused(&m_threadContext)) { + if (!m_gameOpen || paused == GBAThreadIsPaused(&m_threadContext)) { return; } if (paused) {