sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Fixup not showing right menu options

Browse Source
This commit is contained in:
Ben V. Brown
2023-07-21 20:22:31 +10:00
parent ea35b264ab
commit 1e2d9676c9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/Core/Threads/OperatingModes/SettingsMenu.cpp
View File

@@ -86,13 +86,16 @@ OperatingMode moveToNextEntry(guiContext *cxt) {
} }
} else { } else {
(*subEntry) += 1; (*subEntry) += 1;
// If the new entry is null, we need to exit // If the new entry is null, we need to exit
if (subSettingsMenus[*mainEntry][*subEntry].draw == nullptr) { if (subSettingsMenus[*mainEntry][(*subEntry) - 1].draw == nullptr) {
(*subEntry) = 0; // Reset back to the main menu (*subEntry) = 0; // Reset back to the main menu
cxt->transitionMode = TransitionAnimation::Left; cxt->transitionMode = TransitionAnimation::Left;
// Have to break early to avoid the below check underflowing
return OperatingMode::SettingsMenu;
} }
// Check if visible // Check if visible
if (subSettingsMenus[*mainEntry][*subEntry].isVisible != nullptr && !subSettingsMenus[*mainEntry][*subEntry].isVisible()) { if (subSettingsMenus[*mainEntry][(*subEntry) - 1].isVisible != nullptr && !subSettingsMenus[*mainEntry][(*subEntry) - 1].isVisible()) {
// We need to move on as this one isn't visible // We need to move on as this one isn't visible
return moveToNextEntry(cxt); return moveToNextEntry(cxt);
} }