Theme Editor: Fixed bug that crashed conditionals nested in sublines, began work on making progress bars implement RBMovable

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27714 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 3 insertions, 0 deletions

diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index 443d0327f5..4afd04ab9d 100644
--- a/utils/themeeditor/models/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
@@ -1065,6 +1065,9 @@ double ParseTreeNode::findConditionalTime(ParseTreeNode *conditional,
 {
     int child = conditional->evalTag(info, true,
                                      conditional->children.count()).toInt();
+    if(child >= conditional->children.count())
+        child = conditional->children.count() - 1;
+
     return findBranchTime(conditional->children[child], info);
 }