From 4ba576ef8738763b66422b5c48fe83a0117351c3 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 11 Jun 2015 01:27:51 -0700 Subject: [PATCH] Qt: Disable held-rewind when a window loses focus --- src/platform/qt/GameController.cpp | 3 +++ src/platform/qt/Window.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp index 6df9a2bb2..4ac161279 100644 --- a/src/platform/qt/GameController.cpp +++ b/src/platform/qt/GameController.cpp @@ -479,6 +479,9 @@ void GameController::startRewinding() { } void GameController::stopRewinding() { + if (!m_rewindTimer.isActive()) { + return; + } m_rewindTimer.stop(); setPaused(m_wasPaused); } diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 10d30aa32..d69b0ff3b 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -406,6 +406,7 @@ void Window::closeEvent(QCloseEvent* event) { void Window::focusOutEvent(QFocusEvent*) { m_controller->setTurbo(false, false); + m_controller->stopRewinding(); m_controller->clearKeys(); }