From 2c4f40692fb6fbabf3e5c45783911cf949401582 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 3 Dec 2008 09:24:33 +0000 Subject: [PATCH] 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 --- apps/menu.c | 2 ++ 1 file changed, 2 insertions(+) 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 */ }