Qt: Fix setting overrides
Jeffrey Pfau jeffrey@endrift.com
Sun, 16 Oct 2016 13:27:49 -0700
2 files changed,
6 insertions(+),
5 deletions(-)
M
CHANGES
→
CHANGES
@@ -11,6 +11,7 @@ - GBA BIOS: Fix invalid CpuSet not setting BIOS prefetch
- 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
M
src/platform/qt/GameController.cpp
→
src/platform/qt/GameController.cpp
@@ -129,6 +129,11 @@ break;
} 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); }@@ -444,11 +449,6 @@ mCoreAutoloadPatch(m_threadContext.core);
} } m_vf = nullptr; - - if (m_override) { - m_override->identify(m_threadContext.core); - m_override->apply(m_threadContext.core); - } if (!mCoreThreadStart(&m_threadContext)) { emit gameFailed();