From 2ec1551ea64de13eda169aadf8a8df07929ddd15 Mon Sep 17 00:00:00 2001 From: jdgordon Date: Mon, 8 Feb 2010 09:47:08 +0000 Subject: [PATCH] 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 --- apps/gui/wps.c | 4 ++++ apps/settings.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/gui/wps.c b/apps/gui/wps.c index f461c02f7..abe802393 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c @@ -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 diff --git a/apps/settings.c b/apps/settings.c index c4ebabcba..becb516a8 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -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) -- 2.11.4.GIT