From f055ceeac61b1d566ae6b648cef5475ddd65e15f Mon Sep 17 00:00:00 2001 From: Robert Bieber Date: Thu, 12 Aug 2010 18:40:35 +0000 Subject: Theme Editor: Fixed a bug that prevented ID3 info tags from working correctly in conditionals git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27792 a1c6a512-1295-4272-9138-f99709370657 --- utils/themeeditor/models/parsetreenode.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'utils/themeeditor/models/parsetreenode.cpp') diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp index 9cc73ce..c7df4a4 100644 --- a/utils/themeeditor/models/parsetreenode.cpp +++ b/utils/themeeditor/models/parsetreenode.cpp @@ -1007,17 +1007,17 @@ QVariant ParseTreeNode::evalTag(const RBRenderInfo& info, bool conditional, else child = 1; } - else if(val.type() == QVariant::String) + else if(element->tag->name[0] == 'i' || element->tag->name[0] == 'I' + || element->tag->name[0] == 'f' || element->tag->name[0] == 'F') { - if(val.toString().length() > 0) + if(info.device()->data("id3available").toBool()) child = 0; else child = 1; } - else if(element->tag->name[0] == 'i' || element->tag->name[0] == 'I' - || element->tag->name[0] == 'f' || element->tag->name[0] == 'F') + else if(val.type() == QVariant::String) { - if(info.device()->data("id3available").toBool()) + if(val.toString().length() > 0) child = 0; else child = 1; -- cgit v1.1