summaryrefslogtreecommitdiff
path: root/utils/themeeditor/skin_parser.c
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-06-06 03:35:40 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-06-06 03:35:40 +0000
commitf3491e97d0d96f8df8a3c5a16efdef19c0796770 (patch)
treeb5de3be4832afe9ab7e213ea12d8faa2a3335632 /utils/themeeditor/skin_parser.c
parent5619b4f6cf968b8d5820d214790ec29f7f109a63 (diff)
downloadrockbox-f3491e97d0d96f8df8a3c5a16efdef19c0796770.tar.gz
rockbox-f3491e97d0d96f8df8a3c5a16efdef19c0796770.zip
Theme Editor: Began working on open document functionality (still incomplete), fixed a nested conditional parsing bug in the parser, and fixed segfault-on-codegen-from-empty-tree bug
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26609 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/skin_parser.c')
-rw-r--r--utils/themeeditor/skin_parser.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/utils/themeeditor/skin_parser.c b/utils/themeeditor/skin_parser.c
index a771fe7584..c7df7af0c0 100644
--- a/utils/themeeditor/skin_parser.c
+++ b/utils/themeeditor/skin_parser.c
@@ -685,9 +685,15 @@ int skin_parse_conditional(struct skin_element* element, char** document)
685 while(nested) 685 while(nested)
686 { 686 {
687 if(*cursor == ENUMLISTOPENSYM) 687 if(*cursor == ENUMLISTOPENSYM)
688 {
688 nested++; 689 nested++;
689 if(*cursor == ENUMLISTCLOSESYM) 690 break;
691 }
692 else if(*cursor == ENUMLISTCLOSESYM)
693 {
690 nested--; 694 nested--;
695 break;
696 }
691 cursor++; 697 cursor++;
692 } 698 }
693 } 699 }