1
0
Fork 0
forked from len0rd/rockbox

fix red. these long #if's need to be changed to a single #define

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24566 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-02-08 09:47:08 +00:00
parent 7e6f124d4e
commit 54ca765769
2 changed files with 7 additions and 1 deletions

View file

@ -565,7 +565,9 @@ static void gwps_leave_wps(void)
FOR_NB_SCREENS(i)
{
gui_wps[i].display->stop_scroll();
#if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
gui_wps[i].display->backdrop_show(sb_get_backdrop(i));
#endif
#ifdef HAVE_LCD_BITMAP
bool draw = false;
@ -603,7 +605,9 @@ static void gwps_enter_wps(void)
draw = true;
#endif
display->stop_scroll();
#if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
display->backdrop_show(gwps->data->backdrop);
#endif
viewportmanager_theme_enable(i, draw, NULL);
/* Update the values in the first (default) viewport - in case the user

View file

@ -737,7 +737,6 @@ void sound_settings_apply(void)
void settings_apply_skins(void)
{
char buf[MAX_PATH];
int i;
/* re-initialize the skin buffer before we start reloading skins */
skin_buffer_init();
#ifdef HAVE_LCD_BITMAP
@ -787,8 +786,11 @@ void settings_apply_skins(void)
}
#endif
viewportmanager_theme_changed(THEME_STATUSBAR);
#if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
int i;
FOR_NB_SCREENS(i)
screens[i].backdrop_show(sb_get_backdrop(i));
#endif
}
void settings_apply(bool read_disk)