From f657e491036e971725bb963e03775b43c4ecbda4 Mon Sep 17 00:00:00 2001 From: Robert Bieber Date: Thu, 5 Aug 2010 08:49:34 +0000 Subject: 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 --- utils/themeeditor/models/parsetreenode.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'utils/themeeditor/models/parsetreenode.cpp') 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); } -- cgit v1.2.3