summaryrefslogtreecommitdiffstats
path: root/apps/menu.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-01-29 01:01:12 +0000
committerThomas Martitz <kugel@rockbox.org>2011-01-29 01:01:12 +0000
commit89a4cf26933a1c82e4da8f4a382ed9b80f43956e (patch)
tree52957ee5ecc0351b556e818c9a67da440215ed31 /apps/menu.c
parent3f709eada2d67418971ec1c5d907a06ba9161200 (diff)
downloadrockbox-89a4cf26933a1c82e4da8f4a382ed9b80f43956e.tar.gz
rockbox-89a4cf26933a1c82e4da8f4a382ed9b80f43956e.tar.bz2
rockbox-89a4cf26933a1c82e4da8f4a382ed9b80f43956e.zip
Change the way how playlists and system menu items in the main menu are internally invoked so that the mechanism to
pass the back button press to the android system (to let it go to the home screen) works for them. This fixes that the back button goes still to the home screen after entering these items. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29157 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.c')
-rw-r--r--apps/menu.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/menu.c b/apps/menu.c
index 5839a51c21..8ea2f0883e 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -327,7 +327,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
int selected = start_selected? *start_selected : 0;
int action;
struct gui_synclist lists;
- const struct menu_item_ex *temp, *menu;
+ const struct menu_item_ex *temp, *menu = start_menu;
int ret = 0, i;
bool redraw_lists;
int old_audio_status = audio_status();
@@ -347,9 +347,6 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
#endif
menu_callback_type menu_callback = NULL;
- if (start_menu == NULL)
- menu = &main_menu_;
- else menu = start_menu;
/* if hide_theme is true, assume parent has been fixed before passed into
* this function, e.g. with viewport_set_defaults(parent, screen) */