diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-11-03 11:08:55 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-11-03 11:08:55 +0000 |
| commit | f6cf295dd3c79eb26842c54e22007ded8e226023 (patch) | |
| tree | a7b8a69a01271d04c235d402173d35da067fcbb2 | |
| parent | 934b4d4f61a097a9ab227fba5c984d209822c4f9 (diff) | |
| download | rockbox-f6cf295dd3c79eb26842c54e22007ded8e226023.zip rockbox-f6cf295dd3c79eb26842c54e22007ded8e226023.tar.gz rockbox-f6cf295dd3c79eb26842c54e22007ded8e226023.tar.bz2 rockbox-f6cf295dd3c79eb26842c54e22007ded8e226023.tar.xz | |
Fix a bug introduced with r28370 (feature check tag improvements) where %Rp<foo> would fail to parse if the target had recording. Also enable debugging in the checkwps build line
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28473 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | lib/skin_parser/skin_parser.c | 2 | ||||
| -rw-r--r-- | tools/checkwps/checkwps.make | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/skin_parser/skin_parser.c b/lib/skin_parser/skin_parser.c index f574d3f..689a315 100644 --- a/lib/skin_parser/skin_parser.c +++ b/lib/skin_parser/skin_parser.c @@ -958,7 +958,7 @@ static int skin_parse_conditional(struct skin_element* element, const char** doc } if (element->tag->flags&FEATURE_TAG) { - if (feature_available) + if (feature_available && children > 1) children--; } conditional_end = cursor; diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make index 20da68d..e021024 100644 --- a/tools/checkwps/checkwps.make +++ b/tools/checkwps/checkwps.make @@ -22,7 +22,7 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \ -I$(BUILDDIR) # Makes mkdepfile happy -GCCOPTS+=-D__PCTOOL__ -DCHECKWPS +GCCOPTS+=-D__PCTOOL__ -DCHECKWPS -g .SECONDEXPANSION: # $$(OBJ) is not populated until after this |