aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #643

Browse source
This commit is contained in:
Fabio Bas 2015-04-16 12:44:10 +02:00
parent 2f35e86be9
commit 9296e6007f
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/filtertree.cpp
View file

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