diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-09-19 11:49:33 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-09-19 11:49:33 +0000 |
commit | 2c8204cd9168d3a4ffd18862f8396be869bd8e58 (patch) | |
tree | d118a65de534b44e7f13810f06b329ed5f676e45 /apps | |
parent | 272e425a2f5949786d26a25e0c19f593cf04087d (diff) | |
download | rockbox-2c8204cd9168d3a4ffd18862f8396be869bd8e58.tar.gz rockbox-2c8204cd9168d3a4ffd18862f8396be869bd8e58.zip |
Hopefully fix FS#11630 where the wps backdrop would be shown instead of the menu one
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28116 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/skin_engine/skin_backdrops.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c index f5b72a9652..3a000b2c1a 100644 --- a/apps/gui/skin_engine/skin_backdrops.c +++ b/apps/gui/skin_engine/skin_backdrops.c | |||
@@ -63,12 +63,6 @@ int skin_backdrop_assign(char* backdrop, char *bmpdir, | |||
63 | filename[1] = '\0'; | 63 | filename[1] = '\0'; |
64 | filename[2] = '\0'; /* we check this later to see if we actually have an | 64 | filename[2] = '\0'; /* we check this later to see if we actually have an |
65 | image to load. != '\0' means display the image */ | 65 | image to load. != '\0' means display the image */ |
66 | #if NB_SCREENS > 1 | ||
67 | if (screen == SCREEN_REMOTE) | ||
68 | { | ||
69 | filename[0] = '\0'; | ||
70 | } | ||
71 | #endif | ||
72 | } | 66 | } |
73 | else | 67 | else |
74 | { | 68 | { |
@@ -150,8 +144,8 @@ void skin_backdrop_show(int backdrop_id) | |||
150 | enum screen_type screen = backdrops[backdrop_id].screen; | 144 | enum screen_type screen = backdrops[backdrop_id].screen; |
151 | if (backdrops[backdrop_id].name[0] == '-' && | 145 | if (backdrops[backdrop_id].name[0] == '-' && |
152 | backdrops[backdrop_id].name[2] == '\0') | 146 | backdrops[backdrop_id].name[2] == '\0') |
153 | return; | 147 | screens[screen].backdrop_show(NULL); |
154 | if (backdrops[backdrop_id].buffer) | 148 | else if (backdrops[backdrop_id].buffer) |
155 | screens[screen].backdrop_show(backdrops[backdrop_id].buffer); | 149 | screens[screen].backdrop_show(backdrops[backdrop_id].buffer); |
156 | } | 150 | } |
157 | 151 | ||
@@ -185,6 +179,13 @@ void skin_backdrop_load_setting(void) | |||
185 | else | 179 | else |
186 | backdrops[i].name[2] = '\0'; | 180 | backdrops[i].name[2] = '\0'; |
187 | } | 181 | } |
182 | #if NB_SCREENS > 1 | ||
183 | else if (backdrops[i].name[0] == '-') | ||
184 | { | ||
185 | backdrops[i].name[2] = '\0'; | ||
186 | return; | ||
187 | } | ||
188 | #endif | ||
188 | } | 189 | } |
189 | } | 190 | } |
190 | 191 | ||