1
0
Fork 0
forked from len0rd/rockbox

Move all valid menu return codes to a single file (root_menu.h) so we don't need to rely on GO_TO_ROOT == MENU_ATTACHED_USB.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12937 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-03-27 06:38:11 +00:00
parent 40595bd57a
commit 91e726a1c1
4 changed files with 17 additions and 10 deletions

View file

@ -429,16 +429,17 @@ void root_menu(void)
{
switch (ret_val)
{
case MENU_ATTACHED_USB:
case MENU_SELECTED_EXIT:
check_boot();
/* fall through */
case GO_TO_ROOT:
if (last_screen != GO_TO_ROOT)
selected = get_selection(last_screen);
ret_val = do_menu(&root_menu_, &selected);
/* As long as MENU_ATTACHED_USB == GO_TO_ROOT this works */
if (ret_val <= GO_TO_ROOT)
{
if (ret_val == MENU_ATTACHED_USB)
check_boot();
else if (ret_val == GO_TO_PREVIOUS)
if (ret_val == GO_TO_PREVIOUS)
{
ret_val = last_screen;
last_screen = GO_TO_ROOT;