summaryrefslogtreecommitdiffstats
path: root/apps/menu.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-12-03 09:24:33 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-12-03 09:24:33 +0000
commit2c4f40692fb6fbabf3e5c45783911cf949401582 (patch)
tree2e20ef0266af0491dcf80d7a0585cc137b5079bc /apps/menu.c
parent815998c6693998b7d7a3a523058ff0988e735d27 (diff)
downloadrockbox-2c4f40692fb6fbabf3e5c45783911cf949401582.tar.gz
rockbox-2c4f40692fb6fbabf3e5c45783911cf949401582.tar.bz2
rockbox-2c4f40692fb6fbabf3e5c45783911cf949401582.zip
revert part of r18933 which fixes FS#9600.
This fix is a bit wasteful, but fine untill the menu starts being called with a parent viewport. The real fix should be using a callback to notify the menu to reinit its viewports when the theme changes git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19310 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.c')
-rw-r--r--apps/menu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/menu.c b/apps/menu.c
index 3fb1749073..a0317e4a84 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -642,6 +642,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
return_value = temp->function->function();
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)
@@ -659,6 +660,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
{
if (do_setting_from_menu(temp, menu_vp))
{
+ init_default_menu_viewports(menu_vp, hide_bars);
init_menu_lists(menu, &lists, selected, true,vps);
redraw_lists = false; /* above does the redraw */
}