From 92f18fbf3e940e9f9fa02cbe911310d6dfeef704 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Wed, 20 Sep 2017 22:17:55 -0700 Subject: [PATCH] Qt: Fix regression with overrides applying out of order --- src/platform/qt/CoreController.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/platform/qt/CoreController.cpp b/src/platform/qt/CoreController.cpp index bcdca745e..7c4b837f0 100644 --- a/src/platform/qt/CoreController.cpp +++ b/src/platform/qt/CoreController.cpp @@ -61,11 +61,6 @@ CoreController::CoreController(mCore* core, QObject* parent) break; } - if (controller->m_override) { - controller->m_override->identify(context->core); - controller->m_override->apply(context->core); - } - if (controller->m_multiplayer) { controller->m_multiplayer->attachGame(controller); } @@ -79,6 +74,11 @@ CoreController::CoreController(mCore* core, QObject* parent) action(); } + 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); }