From f8e08f0f5ea85a5845b064d7165b094e06fc42c5 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Thu, 15 Feb 2007 23:27:57 +0000 Subject: Remove the menu title on the player. Fix the enu callbacks so ACTION_EXIT_MENUITEM is called when exiting a menu git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12324 a1c6a512-1295-4272-9138-f99709370657 --- apps/menu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/menu.c b/apps/menu.c index 200dd5b983..0060e84ad0 100644 --- a/apps/menu.c +++ b/apps/menu.c @@ -439,12 +439,12 @@ static void init_menu_lists(const struct menu_item_ex *menu, icon = bitmap_icons_6x8[Icon_Submenu_Entered]; else icon = menu->callback_and_desc->icon; -#endif - gui_synclist_set_title(lists, P2STR(menu->callback_and_desc->desc), icon); -#ifdef HAVE_LCD_BITMAP + gui_synclist_set_title(lists, P2STR(menu->callback_and_desc->desc), icon); if (global_settings.show_icons) gui_synclist_set_icon_callback(lists, menu_get_icon); else +#else + (void)icon; #endif gui_synclist_set_icon_callback(lists, NULL); gui_synclist_set_nb_items(lists,current_subitems_count); @@ -549,6 +549,7 @@ int do_menu(const struct menu_item_ex *start_menu) } else { + menu_callback(ACTION_EXIT_MENUITEM, menu); break; } } -- cgit v1.2.3