len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix hotkey select behavior, ignore selection if menu item is not hotkeyable. Will not exit the context menu now

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25877 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jeffrey Goode 2010-05-07 15:03:44 +00:00
parent 2ccb83dd80
commit 227e619bbf
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apps/menu.c
View file

@ -437,10 +437,15 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
((action == ACTION_WPS_HOTKEY) || ((action == ACTION_WPS_HOTKEY) ||
(action == ACTION_TREE_HOTKEY))) (action == ACTION_TREE_HOTKEY)))
{ {
ret = MENU_SELECTED_HOTKEY; int this = get_menu_selection(gui_synclist_get_sel_pos(&lists),menu);
done = true; temp = menu->submenus[this];
selected = get_menu_selection(gui_synclist_get_sel_pos(&lists),menu); if (temp->flags&MENU_FUNC_HOTKEYABLE)
selected_menu_item = menu->submenus[selected]; {
selected_menu_item = temp;
selected = this;
ret = MENU_SELECTED_HOTKEY;
done = true;
}
} }
#endif #endif
else if (action == ACTION_TREE_WPS) else if (action == ACTION_TREE_WPS)