all repos — mgba @ 92f18fbf3e940e9f9fa02cbe911310d6dfeef704

mGBA Game Boy Advance Emulator

Qt: Fix regression with overrides applying out of order
Vicki Pfau vi@endrift.com
Wed, 20 Sep 2017 22:17:55 -0700
commit

92f18fbf3e940e9f9fa02cbe911310d6dfeef704

parent

d5bf63caa832e6daed785b00f690d58f5f5fef5a

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

jump to
M src/platform/qt/CoreController.cpp → src/platform/qt/CoreController.cpp 
@@ -61,11 +61,6 @@ default:
 			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);
 		}

@@ -77,6 +72,11 @@ m_threadContext.resetCallback = [](mCoreThread* context) {
 		CoreController* controller = static_cast<CoreController*>(context->userData);
 		for (auto action : controller->m_resetActions) {
 			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)) {