diff options
author | Christian Soffke <christian.soffke@gmail.com> | 2022-11-15 22:43:41 +0100 |
---|---|---|
committer | Christian Soffke <christian.soffke@gmail.com> | 2022-11-15 22:43:41 +0100 |
commit | be65ec23388937cab264cb4d0174b6471487e9ce (patch) | |
tree | 29164c7922809c3dcfa0a98bb8bd6a668acb1db2 | |
parent | 045895146470b792088c55eee0d00c596df13bb5 (diff) | |
download | rockbox-be65ec23388937cab264cb4d0174b6471487e9ce.tar.gz rockbox-be65ec23388937cab264cb4d0174b6471487e9ce.zip |
Fix menus in Settings
Commit 034b6d5b prevented other Settings menus
on the same menu level from being displayed after
accessing one item's context menu
Change-Id: I378e1748b7f449ad34042a3c8c626488fc07a7d4
-rw-r--r-- | apps/menu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/menu.c b/apps/menu.c index cfc1dce7bd..1b2c21cef7 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -522,16 +522,17 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, | |||
522 | MENUITEM_STRINGLIST(notquickscreen_able_option, | 522 | MENUITEM_STRINGLIST(notquickscreen_able_option, |
523 | ID2P(LANG_ONPLAY_MENU_TITLE), NULL, | 523 | ID2P(LANG_ONPLAY_MENU_TITLE), NULL, |
524 | ID2P(LANG_RESET_SETTING)); | 524 | ID2P(LANG_RESET_SETTING)); |
525 | const struct menu_item_ex *context_menu; | ||
525 | const struct settings_list *setting = | 526 | const struct settings_list *setting = |
526 | find_setting(temp->variable, NULL); | 527 | find_setting(temp->variable, NULL); |
527 | #ifdef HAVE_QUICKSCREEN | 528 | #ifdef HAVE_QUICKSCREEN |
528 | if (is_setting_quickscreenable(setting)) | 529 | if (is_setting_quickscreenable(setting)) |
529 | menu = &quickscreen_able_option; | 530 | context_menu = &quickscreen_able_option; |
530 | else | 531 | else |
531 | #endif | 532 | #endif |
532 | menu = ¬quickscreen_able_option; | 533 | context_menu = ¬quickscreen_able_option; |
533 | 534 | ||
534 | int msel = do_menu(menu, NULL, NULL, false); | 535 | int msel = do_menu(context_menu, NULL, NULL, false); |
535 | 536 | ||
536 | switch (msel) | 537 | switch (msel) |
537 | { | 538 | { |