Merge pull request #976 from ctrlaltca/fix_643

Fix #643 (problem in deck editor's OR filter when no term is enabled)

cockatrice/src/filtertree.cpp

@@ -131,15 +131,18 @@ bool FilterItemList::testTypeAndNot(const CardInfo *info, CardFilter::Attr attr)
 bool FilterItemList::testTypeOr(const CardInfo *info, CardFilter::Attr attr) const
 {
     QList<FilterItem *>::const_iterator i;
+    bool noChildEnabledChild = true;
 
     for (i = childNodes.constBegin(); i != childNodes.constEnd(); i++) {
         if (!(*i)->isEnabled())
             continue;
+        if(noChildEnabledChild)
+            noChildEnabledChild=false;
         if ((*i)->acceptCardAttr(info, attr))
             return true;
     }
 
-    return false;
+    return noChildEnabledChild;
 }
 
 bool FilterItemList::testTypeOrNot(const CardInfo *info, CardFilter::Attr attr) const