Qt: Fix setting overrides

This commit is contained in:
Jeffrey Pfau 2016-10-16 13:27:49 -07:00
parent 7073fa6a24
commit 250c19b91c
2 changed files with 6 additions and 5 deletions

View File

@ -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

View File

@ -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();
}