From 3c95dbb20859debe99edc874c57ddaa6f3acf3d2 Mon Sep 17 00:00:00 2001
From: Robert Bieber <robby@bieberphoto.com>
Date: Fri, 11 Jun 2010 19:51:34 +0000
Subject: Theme Editor: Fixed bug in parser handling empty lines and made
 ParseTreeModel handle the new VIEWPORT element properly

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26792 a1c6a512-1295-4272-9138-f99709370657
---
 utils/themeeditor/skin_parser.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'utils/themeeditor/skin_parser.c')

diff --git a/utils/themeeditor/skin_parser.c b/utils/themeeditor/skin_parser.c
index e6a6350..bf7ca8d 100644
--- a/utils/themeeditor/skin_parser.c
+++ b/utils/themeeditor/skin_parser.c
@@ -249,9 +249,19 @@ static struct skin_element* skin_parse_line_optional(char** document,
     retval = skin_alloc_element();
     retval->type = LINE;
     retval->line = skin_line;
-    if(*cursor != '\0')
+    if(*cursor != '\0' && *cursor != '\n'
+       && !(conditional && (*cursor == ARGLISTSEPERATESYM
+                            || *cursor == ARGLISTCLOSESYM
+                            || *cursor == ENUMLISTSEPERATESYM
+                            || *cursor == ENUMLISTCLOSESYM)))
+    {
         retval->children_count = 1;
-    else retval->children_count = 0;
+    }
+    else
+    {
+        retval->children_count = 0;
+    }
+
     if(retval->children_count > 0)
         retval->children = skin_alloc_children(1);
 
-- 
cgit v1.1