From e1ba7f76efce1c9eabd33577ee4dc4efaa218f70 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Thu, 6 Mar 2008 07:03:14 +0000 Subject: there is no need to load the filename settings unless reading from a .cfg, so stop them being read every time settings_apply() is called git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16535 a1c6a512-1295-4272-9138-f99709370657 --- apps/menus/display_menu.c | 2 +- apps/menus/main_menu.c | 2 +- apps/menus/theme_menu.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'apps/menus') diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index c8d39c7395..2a42a83b07 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c @@ -304,7 +304,7 @@ int statusbar_callback(int action,const struct menu_item_ex *this_item) { case ACTION_EXIT_MENUITEM: /* this should be changed so only the viewports are reloaded */ - settings_apply(); + settings_apply(false); break; } return action; diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index b70295649e..7c2e87c410 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -69,7 +69,7 @@ static int reset_settings(void) { case YESNO_YES: settings_reset(); - settings_apply(); + settings_apply(true); settings_save(); break; case YESNO_NO: diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index 0c17c0c373..80da1aaab9 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c @@ -86,7 +86,7 @@ static int set_color_func(void* color) res = (int)set_color(&screens[SCREEN_MAIN],str(colors[c].lang_id), colors[c].setting,*colors[c].setting); settings_save(); - settings_apply(); + settings_apply(false); return res; } @@ -99,7 +99,7 @@ static int reset_color(void) global_settings.lst_color = LCD_DEFAULT_FG; settings_save(); - settings_apply(); + settings_apply(false); return 0; } MENUITEM_FUNCTION(set_bg_col, MENU_FUNC_USEPARAM, ID2P(LANG_BACKGROUND_COLOR), -- cgit v1.2.3