diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-02-22 07:25:13 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-02-22 07:25:13 +0000 |
| commit | bb79c599d63173e0748ec035a4b43bed8e35012d (patch) | |
| tree | 8d12d4bba4792f791e33e7209e2b71e8352f7fbb /apps/settings.c | |
| parent | e6b202ed6778018f3612e82e7f540b0194660d77 (diff) | |
| download | rockbox-bb79c599d63173e0748ec035a4b43bed8e35012d.tar.gz rockbox-bb79c599d63173e0748ec035a4b43bed8e35012d.zip | |
fix charcell
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24848 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
| -rw-r--r-- | apps/settings.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/settings.c b/apps/settings.c index 14e6cca3df..a8e4cf24a8 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -740,7 +740,7 @@ void sound_settings_apply(void) -/* call this after loading a .wps/.rwps pr other skin files, so that the +/* call this after loading a .wps/.rwps or other skin files, so that the * skin buffer is reset properly */ struct skin_load_setting { @@ -751,7 +751,9 @@ struct skin_load_setting { static struct skin_load_setting skins[] = { /* This determins the load order. *sbs must be loaded before any other * skin on that screen */ +#ifdef HAVE_LCD_BITMAP { global_settings.sbs_file, "sbs", sb_skin_data_load}, +#endif { global_settings.wps_file, "wps", wps_data_load}, #ifdef HAVE_REMOTE_LCD { global_settings.rsbs_file, "rsbs", sb_skin_data_load}, @@ -763,11 +765,12 @@ void settings_apply_skins(void) char buf[MAX_PATH]; /* re-initialize the skin buffer before we start reloading skins */ skin_buffer_init(); - unsigned int i; enum screen_type screen = SCREEN_MAIN; + unsigned int i; #ifdef HAVE_LCD_BITMAP skin_backdrop_init(); skin_font_init(); +#endif for (i=0; i<sizeof(skins)/sizeof(*skins); i++) { #ifdef HAVE_REMOTE_LCD @@ -784,7 +787,6 @@ void settings_apply_skins(void) skins[i].loadfunc(screen, NULL, true); } } -#endif viewportmanager_theme_changed(THEME_STATUSBAR); #if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 FOR_NB_SCREENS(i) |