fix fix fix

This commit is contained in:
eray orçunus 2020-05-29 21:31:06 +03:00
parent e38f2a7fb2
commit 517f0b9189

View file

@ -959,6 +959,10 @@ CMenuManager::Draw()
} }
#endif #endif
#ifdef CUSTOM_FRONTEND_OPTIONS
static int lastOption = m_nCurrOption;
#endif
for (int i = 0; i < NUM_MENUROWS; ++i) { for (int i = 0; i < NUM_MENUROWS; ++i) {
#ifdef CUSTOM_FRONTEND_OPTIONS #ifdef CUSTOM_FRONTEND_OPTIONS
bool isOptionDisabled = false; bool isOptionDisabled = false;
@ -1344,7 +1348,6 @@ CMenuManager::Draw()
} }
#ifdef CUSTOM_FRONTEND_OPTIONS #ifdef CUSTOM_FRONTEND_OPTIONS
static int lastOption = m_nCurrOption;
if (aScreens[m_nCurrScreen].m_aEntries[i].m_Action == MENUACTION_TRIGGERFUNC) { if (aScreens[m_nCurrScreen].m_aEntries[i].m_Action == MENUACTION_TRIGGERFUNC) {
FrontendOption &option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu]; FrontendOption &option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu];
if (option.onlyApplyOnEnter && m_nCurrOption != i) if (option.onlyApplyOnEnter && m_nCurrOption != i)
@ -1355,7 +1358,6 @@ CMenuManager::Draw()
if (oldOption.type == FEOPTION_DYNAMIC) if (oldOption.type == FEOPTION_DYNAMIC)
oldOption.buttonPressFunc(FEOPTION_ACTION_FOCUSLOSS); oldOption.buttonPressFunc(FEOPTION_ACTION_FOCUSLOSS);
} }
lastOption = m_nCurrOption;
} }
#endif #endif
@ -1402,6 +1404,10 @@ CMenuManager::Draw()
} }
} }
#ifdef CUSTOM_FRONTEND_OPTIONS
lastOption = m_nCurrOption;
#endif
switch (m_nCurrScreen) { switch (m_nCurrScreen) {
case MENUPAGE_CONTROLLER_SETTINGS: case MENUPAGE_CONTROLLER_SETTINGS:
case MENUPAGE_SOUND_SETTINGS: case MENUPAGE_SOUND_SETTINGS: