diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-08-12 18:40:35 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-08-12 18:40:35 +0000 |
commit | f055ceeac61b1d566ae6b648cef5475ddd65e15f (patch) | |
tree | bdaa5915f0c71e0082d27c994cd406174aa4178f | |
parent | 71610fbf6259b5b8fdf13d08c8dca506f5dad3ec (diff) | |
download | rockbox-f055ceeac61b1d566ae6b648cef5475ddd65e15f.tar.gz rockbox-f055ceeac61b1d566ae6b648cef5475ddd65e15f.zip |
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
-rw-r--r-- | utils/themeeditor/models/parsetreenode.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp index 9cc73ce1c7..c7df4a4edb 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, | |||
1007 | else | 1007 | else |
1008 | child = 1; | 1008 | child = 1; |
1009 | } | 1009 | } |
1010 | else if(val.type() == QVariant::String) | 1010 | else if(element->tag->name[0] == 'i' || element->tag->name[0] == 'I' |
1011 | || element->tag->name[0] == 'f' || element->tag->name[0] == 'F') | ||
1011 | { | 1012 | { |
1012 | if(val.toString().length() > 0) | 1013 | if(info.device()->data("id3available").toBool()) |
1013 | child = 0; | 1014 | child = 0; |
1014 | else | 1015 | else |
1015 | child = 1; | 1016 | child = 1; |
1016 | } | 1017 | } |
1017 | else if(element->tag->name[0] == 'i' || element->tag->name[0] == 'I' | 1018 | else if(val.type() == QVariant::String) |
1018 | || element->tag->name[0] == 'f' || element->tag->name[0] == 'F') | ||
1019 | { | 1019 | { |
1020 | if(info.device()->data("id3available").toBool()) | 1020 | if(val.toString().length() > 0) |
1021 | child = 0; | 1021 | child = 0; |
1022 | else | 1022 | else |
1023 | child = 1; | 1023 | child = 1; |