all repos — mgba @ c818d506a77e106b0fc3c96d8d07847abf3b84b7

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

c818d506a77e106b0fc3c96d8d07847abf3b84b7

parent

3827f2b91f55af657d9c0e5c62f3e2e415c2748f

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

jump to
M CHANGES → CHANGES 
@@ -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.cpp → src/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) {