devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Theme Editor: Fixed segfaulting conditional bug

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27204 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Bieber 2010-07-01 01:45:24 +00:00
parent 2cfa7ba746
commit 82618e82e6
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
utils/themeeditor/models/parsetreenode.cpp
View file

@ -532,7 +532,7 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport,
else if(element->type == CONDITIONAL) else if(element->type == CONDITIONAL)
{ {
int child = evalTag(info, true, element->children_count).toInt(); 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) 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, QVariant ParseTreeNode::evalTag(const RBRenderInfo& info, bool conditional,
int branches) int branches)
{ {
if(strcmp(element->tag->name, "mv") == 0)
{
int x = 5;
}
if(!conditional) if(!conditional)
{ {
return info.device()->data(QString(element->tag->name)); return info.device()->data(QString(element->tag->name));