diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-08-06 01:08:10 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-08-06 01:08:10 +0000 |
commit | 857741419c7ae2482dbef1c5456e85e35b513a4d (patch) | |
tree | 7a50068fecee7be5638858a2bff2b281bb833bde /apps/gui | |
parent | 31d709f9bb1662fd59c72f3b6466c3b28e463394 (diff) | |
download | rockbox-857741419c7ae2482dbef1c5456e85e35b513a4d.tar.gz rockbox-857741419c7ae2482dbef1c5456e85e35b513a4d.zip |
Move this call a bit up so that wpses without backdrop show none properly (the main backdrop).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22179 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/wps.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index bbf169ff96..a5142a0726 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -92,8 +92,12 @@ static void nextid3available_callback(void* param); | |||
92 | 92 | ||
93 | void wps_data_load(enum screen_type screen, const char *buf, bool isfile) | 93 | void wps_data_load(enum screen_type screen, const char *buf, bool isfile) |
94 | { | 94 | { |
95 | bool loaded_ok = buf && skin_data_load(gui_wps[screen].data, | 95 | bool loaded_ok; |
96 | &screens[screen], buf, isfile); | 96 | |
97 | screens[screen].backdrop_unload(BACKDROP_SKIN_WPS); | ||
98 | |||
99 | loaded_ok = buf && skin_data_load(gui_wps[screen].data, | ||
100 | &screens[screen], buf, isfile); | ||
97 | if (!loaded_ok) /* load the hardcoded default */ | 101 | if (!loaded_ok) /* load the hardcoded default */ |
98 | { | 102 | { |
99 | char *skin_buf[NB_SCREENS] = { | 103 | char *skin_buf[NB_SCREENS] = { |
@@ -116,7 +120,6 @@ void wps_data_load(enum screen_type screen, const char *buf, bool isfile) | |||
116 | "%pb\n", | 120 | "%pb\n", |
117 | #endif | 121 | #endif |
118 | }; | 122 | }; |
119 | screens[screen].backdrop_unload(BACKDROP_SKIN_WPS); | ||
120 | skin_data_load(gui_wps[screen].data, &screens[screen], | 123 | skin_data_load(gui_wps[screen].data, &screens[screen], |
121 | skin_buf[screen], false); | 124 | skin_buf[screen], false); |
122 | } | 125 | } |