summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-12-05 02:07:13 +0000
committerJens Arnold <amiconn@rockbox.org>2005-12-05 02:07:13 +0000
commitf667b87ec9e35b36aa0738d18335365f6509c880 (patch)
tree0b5c005fec9610ada9c02170c059ab066fcd9298
parentbca54ec55e1559d78ca049c2d7fc6c8e8b389afc (diff)
downloadrockbox-f667b87ec9e35b36aa0738d18335365f6509c880.zip
rockbox-f667b87ec9e35b36aa0738d18335365f6509c880.tar.gz
rockbox-f667b87ec9e35b36aa0738d18335365f6509c880.tar.bz2
rockbox-f667b87ec9e35b36aa0738d18335365f6509c880.tar.xz
Fixed non-working WPS on the player. Removed some TABs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8151 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/gwps-common.c3
-rw-r--r--apps/gui/gwps.c14
2 files changed, 9 insertions, 8 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 4eee5f7..afc00a4 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -986,9 +986,10 @@ void gui_wps_format(struct wps_data *data, const char *bmpdir,
wps_tag_found = true;
}
if (*(buf+1) != 'x')
+#endif
buf++;
break;
-#endif
+
case '\r': /* CR */
*buf = 0;
break;
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 05c33a0..aeaaebd 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -775,19 +775,19 @@ bool wps_data_load(struct wps_data *wps_data,
if (! strcmp(buf, WPS_DEFAULTCFG) )
{
wps_reset(wps_data);
- global_settings.wps_file[0] = 0;
+ global_settings.wps_file[0] = 0;
return false;
}
#ifdef HAVE_REMOTE_LCD
- if (! strcmp(buf, RWPS_DEFAULTCFG) )
- {
+ if (! strcmp(buf, RWPS_DEFAULTCFG) )
+ {
wps_reset(wps_data);
- global_settings.rwps_file[0] = 0;
- return false;
- }
+ global_settings.rwps_file[0] = 0;
+ return false;
+ }
#endif
-
+
size_t bmpdirlen;
char *bmpdir = strrchr(buf, '.');
bmpdirlen = bmpdir - buf;