summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJeffrey Goode <jeffg7@gmail.com>2010-05-07 15:03:44 +0000
committerJeffrey Goode <jeffg7@gmail.com>2010-05-07 15:03:44 +0000
commit227e619bbfeaf7d5d3112cc35a1865ff96129c5c (patch)
tree35acd4440aeda0364563bae1a26336e8899ae692 /apps
parent2ccb83dd80292de08164ed193f51319925d16a1d (diff)
downloadrockbox-227e619bbfeaf7d5d3112cc35a1865ff96129c5c.tar.gz
rockbox-227e619bbfeaf7d5d3112cc35a1865ff96129c5c.tar.bz2
rockbox-227e619bbfeaf7d5d3112cc35a1865ff96129c5c.zip
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
Diffstat (limited to 'apps')
-rw-r--r--apps/menu.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/menu.c b/apps/menu.c
index b640905c0f..bfad812803 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)