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/themeeditor | |
parent | 64321adf4331a97201321f5a37d17aa90fa5d5db (diff) | |
download | rockbox-4b77e82d6712b570d71ee6091aeb2793d09bcc61.tar.gz rockbox-4b77e82d6712b570d71ee6091aeb2793d09bcc61.zip |
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/themeeditor')
-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) | |||
175 | } | 175 | } |
176 | else if(*cursor == ENUMLISTOPENSYM) | 176 | else if(*cursor == ENUMLISTOPENSYM) |
177 | { | 177 | { |
178 | skip_arglist(&cursor); | 178 | skip_enumlist(&cursor); |
179 | } | 179 | } |
180 | else | 180 | else |
181 | { | 181 | { |
@@ -793,7 +793,9 @@ static struct skin_element* skin_parse_code_as_arg(char** document) | |||
793 | char* cursor = *document; | 793 | char* cursor = *document; |
794 | 794 | ||
795 | /* Checking for sublines */ | 795 | /* Checking for sublines */ |
796 | while(*cursor != '\n' && *cursor != '\0') | 796 | while(*cursor != '\n' && *cursor != '\0' |
797 | && *cursor != ENUMLISTSEPERATESYM && *cursor != ARGLISTSEPERATESYM | ||
798 | && *cursor != ENUMLISTCLOSESYM && *cursor != ARGLISTCLOSESYM) | ||
797 | { | 799 | { |
798 | if(*cursor == MULTILINESYM) | 800 | if(*cursor == MULTILINESYM) |
799 | { | 801 | { |
@@ -810,6 +812,14 @@ static struct skin_element* skin_parse_code_as_arg(char** document) | |||
810 | 812 | ||
811 | cursor++; | 813 | cursor++; |
812 | } | 814 | } |
815 | else if(*cursor == ARGLISTOPENSYM) | ||
816 | { | ||
817 | skip_arglist(&cursor); | ||
818 | } | ||
819 | else if(*cursor == ENUMLISTOPENSYM) | ||
820 | { | ||
821 | skip_enumlist(&cursor); | ||
822 | } | ||
813 | else | 823 | else |
814 | { | 824 | { |
815 | /* Advancing the cursor as normal */ | 825 | /* Advancing the cursor as normal */ |