From 81cc466534eaa9965ec6c713b0309b7607f780fe Mon Sep 17 00:00:00 2001 From: Blue_Dude Date: Fri, 7 May 2010 15:03:44 +0000 Subject: [PATCH] Fix hotkey select behavior, ignore selection if menu item is not hotkeyable. Will not exit the context menu now git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25877 a1c6a512-1295-4272-9138-f99709370657 --- apps/menu.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/menu.c b/apps/menu.c index b640905c0..bfad81280 100644 --- a/apps/menu.c +++ b/apps/menu.c @@ -437,10 +437,15 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, ((action == ACTION_WPS_HOTKEY) || (action == ACTION_TREE_HOTKEY))) { - ret = MENU_SELECTED_HOTKEY; - done = true; - selected = get_menu_selection(gui_synclist_get_sel_pos(&lists),menu); - selected_menu_item = menu->submenus[selected]; + int this = get_menu_selection(gui_synclist_get_sel_pos(&lists),menu); + temp = menu->submenus[this]; + if (temp->flags&MENU_FUNC_HOTKEYABLE) + { + selected_menu_item = temp; + selected = this; + ret = MENU_SELECTED_HOTKEY; + done = true; + } } #endif else if (action == ACTION_TREE_WPS) -- 2.11.4.GIT