From 3af3fab3cf6af8c8575978239c9182c5f40fd499 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Mon, 1 Jun 2015 23:40:48 -0700
Subject: [PATCH] Qt: Fix held-rewind getting into bad pause states

---
 src/platform/qt/GameController.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp
index 523ba0622..042007183 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -419,6 +419,9 @@ void GameController::threadContinue() {
 }
 
 void GameController::frameAdvance() {
+	if (m_rewindTimer.isActive()) {
+		return;
+	}
 	m_pauseMutex.lock();
 	m_pauseAfterFrame = true;
 	setPaused(false);
@@ -454,7 +457,7 @@ void GameController::rewind(int states) {
 }
 
 void GameController::startRewinding() {
-	if (!m_gameOpen) {
+	if (!m_gameOpen || m_rewindTimer.isActive()) {
 		return;
 	}
 	m_wasPaused = isPaused();