Fix the mechanism to fail to parse skins if images fail to load and fix having no backdrop at all (neither %X nor backdrop setting, DancePuffDuo was broken).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24814 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 3 insertions, 2 deletions

diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c
index b057935241..0a89553cd8 100644
--- a/apps/gui/skin_engine/skin_backdrops.c
+++ b/apps/gui/skin_engine/skin_backdrops.c
@@ -62,7 +62,7 @@ char* skin_backdrop_load(char* backdrop, char *bmpdir, enum screen_type screen)
     else
 #endif
         buf_size = LCD_BACKDROP_BYTES;
-    
+
     if (backdrop[0] == '-')
     {
 #if NB_SCREENS > 1
@@ -73,7 +73,8 @@ char* skin_backdrop_load(char* backdrop, char *bmpdir, enum screen_type screen)
         else
 #endif
         {
-            if (!global_settings.backdrop_file[0])
+            char settings_bdrop = global_settings.backdrop_file[0];
+            if (settings_bdrop == '\0' || settings_bdrop == '-')
             {
                 return NULL; /* backdrop setting not set */
             }