diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-03-06 07:03:14 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-03-06 07:03:14 +0000 |
commit | e1ba7f76efce1c9eabd33577ee4dc4efaa218f70 (patch) | |
tree | af35f13d4d9554a6f017811763172810337acec0 /apps/menus | |
parent | 012833ce1561d9a9d864f608a63a9189ec29b023 (diff) | |
download | rockbox-e1ba7f76efce1c9eabd33577ee4dc4efaa218f70.tar.gz rockbox-e1ba7f76efce1c9eabd33577ee4dc4efaa218f70.zip |
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
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/display_menu.c | 2 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 2 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 4 |
3 files changed, 4 insertions, 4 deletions
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) | |||
304 | { | 304 | { |
305 | case ACTION_EXIT_MENUITEM: | 305 | case ACTION_EXIT_MENUITEM: |
306 | /* this should be changed so only the viewports are reloaded */ | 306 | /* this should be changed so only the viewports are reloaded */ |
307 | settings_apply(); | 307 | settings_apply(false); |
308 | break; | 308 | break; |
309 | } | 309 | } |
310 | return action; | 310 | 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) | |||
69 | { | 69 | { |
70 | case YESNO_YES: | 70 | case YESNO_YES: |
71 | settings_reset(); | 71 | settings_reset(); |
72 | settings_apply(); | 72 | settings_apply(true); |
73 | settings_save(); | 73 | settings_save(); |
74 | break; | 74 | break; |
75 | case YESNO_NO: | 75 | 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) | |||
86 | res = (int)set_color(&screens[SCREEN_MAIN],str(colors[c].lang_id), | 86 | res = (int)set_color(&screens[SCREEN_MAIN],str(colors[c].lang_id), |
87 | colors[c].setting,*colors[c].setting); | 87 | colors[c].setting,*colors[c].setting); |
88 | settings_save(); | 88 | settings_save(); |
89 | settings_apply(); | 89 | settings_apply(false); |
90 | return res; | 90 | return res; |
91 | } | 91 | } |
92 | 92 | ||
@@ -99,7 +99,7 @@ static int reset_color(void) | |||
99 | global_settings.lst_color = LCD_DEFAULT_FG; | 99 | global_settings.lst_color = LCD_DEFAULT_FG; |
100 | 100 | ||
101 | settings_save(); | 101 | settings_save(); |
102 | settings_apply(); | 102 | settings_apply(false); |
103 | return 0; | 103 | return 0; |
104 | } | 104 | } |
105 | MENUITEM_FUNCTION(set_bg_col, MENU_FUNC_USEPARAM, ID2P(LANG_BACKGROUND_COLOR), | 105 | MENUITEM_FUNCTION(set_bg_col, MENU_FUNC_USEPARAM, ID2P(LANG_BACKGROUND_COLOR), |