From f6cf295dd3c79eb26842c54e22007ded8e226023 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 3 Nov 2010 11:08:55 +0000 Subject: [PATCH] Fix a bug introduced with r28370 (feature check tag improvements) where %Rp 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 --- lib/skin_parser/skin_parser.c | 2 +- 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 f574d3f7a2..689a315bfa 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 20da68dbe3..e021024901 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