summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-05-29 20:31:06 +0200
committereray orçunus <erayorcunus@gmail.com>2020-05-29 20:31:06 +0200
commit517f0b9189bed37c06110f8cb6bc2ab7763ce8f0 (patch)
tree5361d7e40d93c2444de6dea40ab599ccaf04f5a9 /src/core
parentfix fix (diff)
downloadre3-517f0b9189bed37c06110f8cb6bc2ab7763ce8f0.tar
re3-517f0b9189bed37c06110f8cb6bc2ab7763ce8f0.tar.gz
re3-517f0b9189bed37c06110f8cb6bc2ab7763ce8f0.tar.bz2
re3-517f0b9189bed37c06110f8cb6bc2ab7763ce8f0.tar.lz
re3-517f0b9189bed37c06110f8cb6bc2ab7763ce8f0.tar.xz
re3-517f0b9189bed37c06110f8cb6bc2ab7763ce8f0.tar.zst
re3-517f0b9189bed37c06110f8cb6bc2ab7763ce8f0.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Frontend.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index a38df5e0..b95deee3 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -959,6 +959,10 @@ CMenuManager::Draw()
}
#endif
+#ifdef CUSTOM_FRONTEND_OPTIONS
+ static int lastOption = m_nCurrOption;
+#endif
+
for (int i = 0; i < NUM_MENUROWS; ++i) {
#ifdef CUSTOM_FRONTEND_OPTIONS
bool isOptionDisabled = false;
@@ -1344,7 +1348,6 @@ CMenuManager::Draw()
}
#ifdef CUSTOM_FRONTEND_OPTIONS
- static int lastOption = m_nCurrOption;
if (aScreens[m_nCurrScreen].m_aEntries[i].m_Action == MENUACTION_TRIGGERFUNC) {
FrontendOption &option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu];
if (option.onlyApplyOnEnter && m_nCurrOption != i)
@@ -1355,7 +1358,6 @@ CMenuManager::Draw()
if (oldOption.type == FEOPTION_DYNAMIC)
oldOption.buttonPressFunc(FEOPTION_ACTION_FOCUSLOSS);
}
- lastOption = m_nCurrOption;
}
#endif
@@ -1402,6 +1404,10 @@ CMenuManager::Draw()
}
}
+#ifdef CUSTOM_FRONTEND_OPTIONS
+ lastOption = m_nCurrOption;
+#endif
+
switch (m_nCurrScreen) {
case MENUPAGE_CONTROLLER_SETTINGS:
case MENUPAGE_SOUND_SETTINGS: