From 2bcc83b51c3561937954898cf37823c36939eef9 Mon Sep 17 00:00:00 2001 From: bieber Date: Thu, 1 Jul 2010 01:45:24 +0000 Subject: [PATCH] Theme Editor: Fixed segfaulting conditional bug git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27204 a1c6a512-1295-4272-9138-f99709370657 --- utils/themeeditor/models/parsetreenode.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp index 300d5195d..fabb57831 100644 --- a/utils/themeeditor/models/parsetreenode.cpp +++ b/utils/themeeditor/models/parsetreenode.cpp @@ -532,7 +532,7 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport, else if(element->type == CONDITIONAL) { int child = evalTag(info, true, element->children_count).toInt(); - children[child]->render(info, viewport, true); + children[element->params_count + child]->render(info, viewport, true); } else if(element->type == SUBLINES) { @@ -796,6 +796,10 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport) QVariant ParseTreeNode::evalTag(const RBRenderInfo& info, bool conditional, int branches) { + if(strcmp(element->tag->name, "mv") == 0) + { + int x = 5; + } if(!conditional) { return info.device()->data(QString(element->tag->name)); -- 2.11.4.GIT