found (and fixed) by Stephane Doyon...

"A glitch was recently introduced when backing out of context menu functions. When exiting for example the playlist viewer, or the id3 viewer, it will speak the name of the menu entry used to access that function. That's pretty confusing because it sounds like you dropped back into the menu system while we have in fact exited the context menu completely."



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17293 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 5 insertions, 4 deletions

diff --git a/apps/menu.c b/apps/menu.c
index e29b9c4e76..f61acd076b 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -569,10 +569,11 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
                                     temp->function->param);
                     else 
                         return_value = temp->function->function();
-                    
-                    init_default_menu_viewports(menu_vp, hide_bars);
-                    init_menu_lists(menu, &lists, selected, true, vps);
-                    
+                    if (!(menu->flags&MENU_EXITAFTERTHISMENU) || (temp->flags&MENU_EXITAFTERTHISMENU))
+                    {
+                        init_default_menu_viewports(menu_vp, hide_bars);
+                        init_menu_lists(menu, &lists, selected, true, vps);
+                    }
                     if (temp->flags&MENU_FUNC_CHECK_RETVAL)
                     {
                         if (return_value == 1)