ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix regression with overrides applying out of order

This commit is contained in:
Vicki Pfau 2017-09-20 22:17:55 -07:00
parent d5bf63caa8
commit 92f18fbf3e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/platform/qt/CoreController.cpp
View File

@ -61,11 +61,6 @@ CoreController::CoreController(mCore* core, QObject* parent)
break; break;
} }
if (controller->m_override) {
controller->m_override->identify(context->core);
controller->m_override->apply(context->core);
}
if (controller->m_multiplayer) { if (controller->m_multiplayer) {
controller->m_multiplayer->attachGame(controller); controller->m_multiplayer->attachGame(controller);
} }
@ -79,6 +74,11 @@ CoreController::CoreController(mCore* core, QObject* parent)
action(); 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)) { if (mCoreLoadState(context->core, 0, controller->m_loadStateFlags)) {
mCoreDeleteState(context->core, 0); mCoreDeleteState(context->core, 0);
} }