diff options
| author | Robert Bieber <robby@bieberphoto.com> | 2010-06-10 21:22:16 +0000 |
|---|---|---|
| committer | Robert Bieber <robby@bieberphoto.com> | 2010-06-10 21:22:16 +0000 |
| commit | 4b77e82d6712b570d71ee6091aeb2793d09bcc61 (patch) | |
| tree | cc8a21970ed14446a25fb1c4e6c89d1e8a864f10 /utils | |
| parent | 64321adf4331a97201321f5a37d17aa90fa5d5db (diff) | |
Theme Editor: Fixed issue with parsing conditionals in sublines
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26752 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/themeeditor/skin_parser.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/utils/themeeditor/skin_parser.c b/utils/themeeditor/skin_parser.c index 0eda9daa09..f17f68854a 100644 --- a/utils/themeeditor/skin_parser.c +++ b/utils/themeeditor/skin_parser.c @@ -175,7 +175,7 @@ static struct skin_element* skin_parse_viewport(char** document) } else if(*cursor == ENUMLISTOPENSYM) { - skip_arglist(&cursor); + skip_enumlist(&cursor); } else { @@ -793,7 +793,9 @@ static struct skin_element* skin_parse_code_as_arg(char** document) char* cursor = *document; /* Checking for sublines */ - while(*cursor != '\n' && *cursor != '\0') + while(*cursor != '\n' && *cursor != '\0' + && *cursor != ENUMLISTSEPERATESYM && *cursor != ARGLISTSEPERATESYM + && *cursor != ENUMLISTCLOSESYM && *cursor != ARGLISTCLOSESYM) { if(*cursor == MULTILINESYM) { @@ -810,6 +812,14 @@ static struct skin_element* skin_parse_code_as_arg(char** document) cursor++; } + else if(*cursor == ARGLISTOPENSYM) + { + skip_arglist(&cursor); + } + else if(*cursor == ENUMLISTOPENSYM) + { + skip_enumlist(&cursor); + } else { /* Advancing the cursor as normal */ |