all repos — mgba @ 3af3fab3cf6af8c8575978239c9182c5f40fd499

mGBA Game Boy Advance Emulator

Qt: Fix held-rewind getting into bad pause states
Jeffrey Pfau jeffrey@endrift.com
Mon, 01 Jun 2015 23:40:48 -0700
commit

3af3fab3cf6af8c8575978239c9182c5f40fd499

parent

502ca7abd7b689e15a4cfaf9ad0d346777215179

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

jump to
M src/platform/qt/GameController.cpp → src/platform/qt/GameController.cpp 
@@ -419,6 +419,9 @@ }
 }
 
 void GameController::frameAdvance() {
+	if (m_rewindTimer.isActive()) {
+		return;
+	}
 	m_pauseMutex.lock();
 	m_pauseAfterFrame = true;
 	setPaused(false);

@@ -454,7 +457,7 @@ emit frameAvailable(m_drawContext);
 }
 
 void GameController::startRewinding() {
-	if (!m_gameOpen) {
+	if (!m_gameOpen || m_rewindTimer.isActive()) {
 		return;
 	}
 	m_wasPaused = isPaused();