summaryrefslogtreecommitdiffstats
path: root/apps/root_menu.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-08-07 08:39:56 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-08-07 08:39:56 +0000
commit835683b442f6d743318d2ab85b0ee99cbe9b3096 (patch)
treea9ae4bfdc1613a9a9b1cd6ec54f8b85cee9f8dac /apps/root_menu.c
parenta668072d9eb4d22f63378f35dbce1e533a70dd9b (diff)
downloadrockbox-835683b442f6d743318d2ab85b0ee99cbe9b3096.tar.gz
rockbox-835683b442f6d743318d2ab85b0ee99cbe9b3096.tar.bz2
rockbox-835683b442f6d743318d2ab85b0ee99cbe9b3096.zip
%cs (current screen) changes:
* Every top level menu item now has a different screen number * Playlist viewer and Playlist Catalogue browsers no longer share the same number git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30261 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/root_menu.c')
-rw-r--r--apps/root_menu.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 573ea9415c..472c1db357 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -552,6 +552,8 @@ static inline int load_screen(int screen)
activity = ACTIVITY_PLUGINBROWSER;
else if (screen == GO_TO_MAINMENU)
activity = ACTIVITY_SETTINGS;
+ else if (screen == GO_TO_SYSTEM_SCREEN)
+ activity = ACTIVITY_SYSTEMSCREEN;
if (activity != ACTIVITY_UNKNOWN)
push_current_activity(activity);
@@ -569,6 +571,8 @@ static inline int load_screen(int screen)
static int load_context_screen(int selection)
{
const struct menu_item_ex *context_menu = NULL;
+ int retval = GO_TO_PREVIOUS;
+ push_current_activity(ACTIVITY_CONTEXTMENU);
if ((root_menu__[selection]->flags&MENU_TYPE_MASK) == MT_RETURN_VALUE)
{
int item = root_menu__[selection]->value;
@@ -581,9 +585,9 @@ static int load_context_screen(int selection)
}
if (context_menu)
- return do_menu(context_menu, NULL, NULL, false);
- else
- return GO_TO_PREVIOUS;
+ retval = do_menu(context_menu, NULL, NULL, false);
+ pop_current_activity();
+ return retval;
}
#ifdef HAVE_PICTUREFLOW_INTEGRATION