From bb79c599d63173e0748ec035a4b43bed8e35012d Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 22 Feb 2010 07:25:13 +0000 Subject: fix charcell git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24848 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/settings.c b/apps/settings.c index 14e6cca..a8e4cf2 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 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 FOR_NB_SCREENS(i) -- cgit v1.1