diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-02-26 08:01:41 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-02-26 08:01:41 +0000 |
commit | 4c6b3551b585590e21639d09198b0777b25bf04f (patch) | |
tree | 61175529bff58521341186528871074b366e6436 /apps/menus | |
parent | c396e4161a9bd3f15b779476b3f18400abbecf11 (diff) | |
download | rockbox-4c6b3551b585590e21639d09198b0777b25bf04f.tar.gz rockbox-4c6b3551b585590e21639d09198b0777b25bf04f.zip |
split the theme settings apply() sutff out of settings_apply(). this should fix splashes not being loc'ed, statusbar over the splash (fixed in sim, not on my mini2g though), and the supposed boot time slowdown.
What this also does is remove a bunch of unnecessary settings_Apply()'s from the ipod accessory code, and causes all non-skin settings to get applied each time (this includes font and langs which we wernt doing to stop disk access)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24922 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/main_menu.c | 3 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 783490284c..2d3a65a7b2 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -76,8 +76,9 @@ static int reset_settings(void) | |||
76 | { | 76 | { |
77 | case YESNO_YES: | 77 | case YESNO_YES: |
78 | settings_reset(); | 78 | settings_reset(); |
79 | settings_apply(true); | ||
80 | settings_save(); | 79 | settings_save(); |
80 | settings_apply(); | ||
81 | settings_apply_skins(); | ||
81 | break; | 82 | break; |
82 | case YESNO_NO: | 83 | case YESNO_NO: |
83 | break; | 84 | break; |
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index b3abb77869..ee1970ee44 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(false); | 99 | settings_apply(); |
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(false); | 112 | settings_apply(); |
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), |