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

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,
         filename[1] = '\0';
         filename[2] = '\0'; /* we check this later to see if we actually have an
                                image to load. != '\0' means display the image */
-#if NB_SCREENS > 1
-        if (screen == SCREEN_REMOTE)
-        {
-            filename[0] = '\0';
-        }
-#endif
     }
     else
     {
@@ -150,8 +144,8 @@ void skin_backdrop_show(int backdrop_id)
     enum screen_type screen = backdrops[backdrop_id].screen;
     if (backdrops[backdrop_id].name[0] == '-' &&
         backdrops[backdrop_id].name[2] == '\0')
-        return;
-    if (backdrops[backdrop_id].buffer)
+        screens[screen].backdrop_show(NULL);
+    else if (backdrops[backdrop_id].buffer)
         screens[screen].backdrop_show(backdrops[backdrop_id].buffer);
 }
 
@@ -185,6 +179,13 @@ void skin_backdrop_load_setting(void)
             else
                 backdrops[i].name[2] = '\0';
         }
+#if NB_SCREENS > 1
+        else if (backdrops[i].name[0] == '-')
+        {
+            backdrops[i].name[2] = '\0';
+            return;
+        }
+#endif
     }
 }