From fb7715f6ac8e3e31869ceeef92ab9dd2ae7546b4 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Mon, 19 Jun 2017 22:37:30 -0700
Subject: [PATCH] Qt: Fix game unpausing after frame advancing and refocusing
---
CHANGES | 1 +
src/platform/qt/GameController.cpp | 1 +
2 files changed, 2 insertions(+)
diff --git a/CHANGES b/CHANGES
index 995ea9d84..360f7a5e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -71,6 +71,7 @@ Bugfixes:
- GBA BIOS: Fix INT_MIN/-1 crash
- GBA Savedata: Update and fix Sharkport importing (fixes mgba.io/i/658)
- OpenGL: Fix some shaders causing offset graphics
+ - Qt: Fix game unpausing after frame advancing and refocusing
Misc:
- SDL: Remove scancode key input
- GBA Video: Clean up unused timers
diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp
index 7f5e0737d..ef1b3dddb 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -697,6 +697,7 @@ void GameController::threadContinue() {
void GameController::frameAdvance() {
if (m_pauseAfterFrame.testAndSetRelaxed(false, true)) {
setPaused(false);
+ m_wasPaused = true;
}
}