From be65ec23388937cab264cb4d0174b6471487e9ce Mon Sep 17 00:00:00 2001 From: Christian Soffke Date: Tue, 15 Nov 2022 22:43:41 +0100 Subject: 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 --- apps/menu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'apps/menu.c') 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, MENUITEM_STRINGLIST(notquickscreen_able_option, ID2P(LANG_ONPLAY_MENU_TITLE), NULL, ID2P(LANG_RESET_SETTING)); + const struct menu_item_ex *context_menu; const struct settings_list *setting = find_setting(temp->variable, NULL); #ifdef HAVE_QUICKSCREEN if (is_setting_quickscreenable(setting)) - menu = &quickscreen_able_option; + context_menu = &quickscreen_able_option; else #endif - menu = ¬quickscreen_able_option; + context_menu = ¬quickscreen_able_option; - int msel = do_menu(menu, NULL, NULL, false); + int msel = do_menu(context_menu, NULL, NULL, false); switch (msel) { -- cgit v1.2.3