From 250c19b91c738716e981d52f4fb1edd8b6c16a51 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sun, 16 Oct 2016 13:27:49 -0700
Subject: [PATCH] Qt: Fix setting overrides

---
 CHANGES                            |  1 +
 src/platform/qt/GameController.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index bfe7b7b3d..28bc6d897 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ Bugfixes:
  - GB MBC: Fix SRAM dangling pointer with RTC games
  - Windows: Fix Unicode directory handling
  - Qt: Fix changing resolution of software renderer
+ - Qt: Fix setting overrides
 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 a96782365..c3d54bd51 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -129,6 +129,11 @@ GameController::GameController(QObject* parent)
 		}
 		controller->m_fpsTarget = context->sync.fpsTarget;
 
+		if (controller->m_override) {
+			controller->m_override->identify(context->core);
+			controller->m_override->apply(context->core);
+		}
+
 		if (mCoreLoadState(context->core, 0, controller->m_loadStateFlags)) {
 			mCoreDeleteState(context->core, 0);
 		}
@@ -445,11 +450,6 @@ void GameController::openGame(bool biosOnly) {
 	}
 	m_vf = nullptr;
 
-	if (m_override) {
-		m_override->identify(m_threadContext.core);
-		m_override->apply(m_threadContext.core);
-	}
-
 	if (!mCoreThreadStart(&m_threadContext)) {
 		emit gameFailed();
 	}