diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-12-03 09:24:33 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-12-03 09:24:33 +0000 |
commit | 2c4f40692fb6fbabf3e5c45783911cf949401582 (patch) | |
tree | 2e20ef0266af0491dcf80d7a0585cc137b5079bc | |
parent | 815998c6693998b7d7a3a523058ff0988e735d27 (diff) | |
download | rockbox-2c4f40692fb6fbabf3e5c45783911cf949401582.tar.gz 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
-rw-r--r-- | apps/menu.c | 2 |
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, | |||
642 | return_value = temp->function->function(); | 642 | return_value = temp->function->function(); |
643 | if (!(menu->flags&MENU_EXITAFTERTHISMENU) || (temp->flags&MENU_EXITAFTERTHISMENU)) | 643 | if (!(menu->flags&MENU_EXITAFTERTHISMENU) || (temp->flags&MENU_EXITAFTERTHISMENU)) |
644 | { | 644 | { |
645 | init_default_menu_viewports(menu_vp, hide_bars); | ||
645 | init_menu_lists(menu, &lists, selected, true, vps); | 646 | init_menu_lists(menu, &lists, selected, true, vps); |
646 | } | 647 | } |
647 | if (temp->flags&MENU_FUNC_CHECK_RETVAL) | 648 | if (temp->flags&MENU_FUNC_CHECK_RETVAL) |
@@ -659,6 +660,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, | |||
659 | { | 660 | { |
660 | if (do_setting_from_menu(temp, menu_vp)) | 661 | if (do_setting_from_menu(temp, menu_vp)) |
661 | { | 662 | { |
663 | init_default_menu_viewports(menu_vp, hide_bars); | ||
662 | init_menu_lists(menu, &lists, selected, true,vps); | 664 | init_menu_lists(menu, &lists, selected, true,vps); |
663 | redraw_lists = false; /* above does the redraw */ | 665 | redraw_lists = false; /* above does the redraw */ |
664 | } | 666 | } |