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
This commit is contained in:
Thomas Martitz 2009-08-06 01:08:10 +00:00
parent 31d709f9bb
commit 857741419c

View file

@ -92,8 +92,12 @@ static void nextid3available_callback(void* param);
void wps_data_load(enum screen_type screen, const char *buf, bool isfile) void wps_data_load(enum screen_type screen, const char *buf, bool isfile)
{ {
bool loaded_ok = buf && skin_data_load(gui_wps[screen].data, bool loaded_ok;
&screens[screen], buf, isfile);
screens[screen].backdrop_unload(BACKDROP_SKIN_WPS);
loaded_ok = buf && skin_data_load(gui_wps[screen].data,
&screens[screen], buf, isfile);
if (!loaded_ok) /* load the hardcoded default */ if (!loaded_ok) /* load the hardcoded default */
{ {
char *skin_buf[NB_SCREENS] = { char *skin_buf[NB_SCREENS] = {
@ -116,7 +120,6 @@ void wps_data_load(enum screen_type screen, const char *buf, bool isfile)
"%pb\n", "%pb\n",
#endif #endif
}; };
screens[screen].backdrop_unload(BACKDROP_SKIN_WPS);
skin_data_load(gui_wps[screen].data, &screens[screen], skin_data_load(gui_wps[screen].data, &screens[screen],
skin_buf[screen], false); skin_buf[screen], false);
} }