From 9296e6007fa7ad1ba86eea898fecca07cca3a076 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Thu, 16 Apr 2015 12:44:10 +0200 Subject: [PATCH] Fix #643 --- cockatrice/src/filtertree.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cockatrice/src/filtertree.cpp b/cockatrice/src/filtertree.cpp index ef843d7b..02fce238 100644 --- a/cockatrice/src/filtertree.cpp +++ b/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::const_iterator i; + bool enabledChilds = false; for (i = childNodes.constBegin(); i != childNodes.constEnd(); i++) { if (!(*i)->isEnabled()) continue; + if(!enabledChilds) + enabledChilds=true; if ((*i)->acceptCardAttr(info, attr)) return true; } - return false; + return enabledChilds ? false : true; } bool FilterItemList::testTypeOrNot(const CardInfo *info, CardFilter::Attr attr) const