summaryrefslogtreecommitdiffstats
path: root/apps/menu.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-11-04 12:40:18 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-11-04 12:40:18 +0000
commita6f2b82803d5b48f1c16e630d14883ec0a474dbe (patch)
tree318b3322b025fd252502676ae6062681e558fd03 /apps/menu.c
parent62decc42e7f6752d786090277ac4b7f2d2036ad4 (diff)
downloadrockbox-a6f2b82803d5b48f1c16e630d14883ec0a474dbe.tar.gz
rockbox-a6f2b82803d5b48f1c16e630d14883ec0a474dbe.tar.bz2
rockbox-a6f2b82803d5b48f1c16e630d14883ec0a474dbe.zip
revert my previous commit and do it in a much less hacky way (both of these were for FS#8084)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15458 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.c')
-rw-r--r--apps/menu.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/apps/menu.c b/apps/menu.c
index f9a2f3c45c..8e96cc4edf 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -291,11 +291,6 @@ bool do_setting_from_menu(const struct menu_item_ex *temp)
return false;
}
-/* HACK ALERT: this is needed so pressing stop in the wps context menu returns to
- the main menu as it is expected. otherwise there can be nasty side-effects
- if any of the items are selected. */
-extern const struct menu_item_ex wps_onplay_menu;
-
/* display a menu */
int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
{
@@ -375,12 +370,6 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
else if (action == ACTION_TREE_STOP)
{
redraw_lists = list_stop_handler();
- /*return to the main menu if stop is pressed in the WPS context menu */
- if (menu == &wps_onplay_menu)
- {
- ret = GO_TO_ROOT;
- done = true;
- }
}
else if (action == ACTION_STD_CONTEXT &&
menu == &root_menu_)