summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-07-01 01:45:24 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-07-01 01:45:24 +0000
commit82618e82e6f23d67d2da4560288f7e1f1079813b (patch)
tree56fa2e1982529fe25f78515f6f2244ed3214ce66 /utils
parent2cfa7ba7460f882d5bf2fe8f904fae5e572fecf3 (diff)
downloadrockbox-82618e82e6f23d67d2da4560288f7e1f1079813b.tar.gz
rockbox-82618e82e6f23d67d2da4560288f7e1f1079813b.tar.bz2
rockbox-82618e82e6f23d67d2da4560288f7e1f1079813b.zip
Theme Editor: Fixed segfaulting conditional bug
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27204 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils')
-rw-r--r--utils/themeeditor/models/parsetreenode.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index 300d5195de..fabb578316 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));