summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-02-08 09:47:08 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-02-08 09:47:08 +0000
commit54ca7657699577b1e8e84bc98ac2aa00eef6bc69 (patch)
tree32eeacb4698fc6aa4f4da7ae60cb9f7de6b841d3
parent7e6f124d4e155c4a9672c9797a324305f047466a (diff)
downloadrockbox-54ca7657699577b1e8e84bc98ac2aa00eef6bc69.tar.gz
rockbox-54ca7657699577b1e8e84bc98ac2aa00eef6bc69.tar.bz2
rockbox-54ca7657699577b1e8e84bc98ac2aa00eef6bc69.zip
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
-rw-r--r--apps/gui/wps.c4
-rw-r--r--apps/settings.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index f461c02f77..abe8023938 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 c4ebabcbac..becb516a81 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)