When fixing things is it better to do it in a way that causes them to actually work. Some more bugs in wpsbuild.pl squashed. Also, themes moved to the main menu. Resetting to default themes now works properly.

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

1 files changed, 13 insertions, 2 deletions

diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 2fff66e337..5877cf7c4b 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -731,11 +731,22 @@ bool wps_data_load(struct wps_data *wps_data,
          * wants to be a virtual file.  Feel free to modify dirbrowse()
          * if you're feeling brave.
          */
-        if (! strcmp(buf, WPS_DEFAULTCFG) || !strcmp(buf, RWPS_DEFAULTCFG) )
+        if (! strcmp(buf, WPS_DEFAULTCFG) )
         {
             wps_reset(wps_data);
+	    global_settings.wps_file[0] = 0;
             return false;
-        }
+        } 
+
+#ifdef HAVE_REMOTE_LCD
+	if (! strcmp(buf, RWPS_DEFAULTCFG) )
+       	{
+            wps_reset(wps_data);
+	    global_settings.rwps_file[0] = 0;
+	    return false;
+	}
+#endif
+	
         size_t bmpdirlen;
         char *bmpdir = strrchr(buf, '.');
         bmpdirlen = bmpdir - buf;