diff options
author | Magnus Holmgren <magnushol@gmail.com> | 2010-03-06 12:14:12 +0000 |
---|---|---|
committer | Magnus Holmgren <magnushol@gmail.com> | 2010-03-06 12:14:12 +0000 |
commit | a14f4acb0c9ecdb11845a84e6d83b1a7bdbd5c7b (patch) | |
tree | 1da03334463791e9b3c7e2f09102b9f856c3e565 /apps/menus | |
parent | 8050d47a4e2c3a62160d617af1c1ca38382f1319 (diff) | |
download | rockbox-a14f4acb0c9ecdb11845a84e6d83b1a7bdbd5c7b.tar.gz rockbox-a14f4acb0c9ecdb11845a84e6d83b1a7bdbd5c7b.zip |
Restore the 'read_disk' flag for settings_apply that was removed in r24922. It is still needed to prevent uncessary disk I/O for fonts etc. Should fix FS#11071 (I haven't tested it on a HD-based player).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25042 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/main_menu.c | 2 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 2d3a65a7b2..59a72e1ad7 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -77,7 +77,7 @@ static int reset_settings(void) | |||
77 | case YESNO_YES: | 77 | case YESNO_YES: |
78 | settings_reset(); | 78 | settings_reset(); |
79 | settings_save(); | 79 | settings_save(); |
80 | settings_apply(); | 80 | settings_apply(true); |
81 | settings_apply_skins(); | 81 | settings_apply_skins(); |
82 | break; | 82 | break; |
83 | case YESNO_NO: | 83 | case YESNO_NO: |
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index 7d2a05c67f..4427e4aeca 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c | |||
@@ -96,7 +96,7 @@ static int set_color_func(void* color) | |||
96 | res = (int)set_color(&screens[SCREEN_MAIN],str(colors[c].lang_id), | 96 | res = (int)set_color(&screens[SCREEN_MAIN],str(colors[c].lang_id), |
97 | colors[c].setting, banned_color); | 97 | colors[c].setting, banned_color); |
98 | settings_save(); | 98 | settings_save(); |
99 | settings_apply(); | 99 | settings_apply(false); |
100 | return res; | 100 | return res; |
101 | } | 101 | } |
102 | 102 | ||
@@ -109,7 +109,7 @@ static int reset_color(void) | |||
109 | global_settings.lst_color = LCD_DEFAULT_FG; | 109 | global_settings.lst_color = LCD_DEFAULT_FG; |
110 | 110 | ||
111 | settings_save(); | 111 | settings_save(); |
112 | settings_apply(); | 112 | settings_apply(false); |
113 | return 0; | 113 | return 0; |
114 | } | 114 | } |
115 | MENUITEM_FUNCTION(set_bg_col, MENU_FUNC_USEPARAM, ID2P(LANG_BACKGROUND_COLOR), | 115 | MENUITEM_FUNCTION(set_bg_col, MENU_FUNC_USEPARAM, ID2P(LANG_BACKGROUND_COLOR), |