summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-04-13 07:32:00 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-04-13 07:32:00 +0000
commit99a2299654dd937db6b797562660a1e87f983c2a (patch)
tree0015a9abecda045f576a26b293f8930e308e0b98
parentf359ec763094d895a8f6dc96a2496180431ef2f9 (diff)
downloadrockbox-99a2299654dd937db6b797562660a1e87f983c2a.zip
rockbox-99a2299654dd937db6b797562660a1e87f983c2a.tar.gz
rockbox-99a2299654dd937db6b797562660a1e87f983c2a.tar.bz2
rockbox-99a2299654dd937db6b797562660a1e87f983c2a.tar.xz
allow %pb and %pv (long form) to be put inside conditionals (i.ee not eat the whole line).
If this causes your theme to break you need to add a # after the line. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25616 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_parser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 54995d4..7b09cfb 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1225,8 +1225,8 @@ static int parse_progressbar(const char *wps_bufptr,
if (token->type == WPS_TOKEN_VOLUME)
token->type = WPS_TOKEN_VOLUMEBAR;
pb->type = token->type;
- /* Skip the rest of the line */
- return skip_end_of_line(wps_bufptr)-1;
+
+ return ptr+1-wps_bufptr;
#else
(void)wps_bufptr;
if (token->type != WPS_TOKEN_VOLUME)