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

Merge pull request #976 from ctrlaltca/fix_643

Browse source 
Fix #643 (problem in deck editor's OR filter when no term is enabled)
This commit is contained in:
ctrlaltca 2015-04-17 09:47:32 +02:00
commit 6807fed02f
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 noChildEnabledChild = true;
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(noChildEnabledChild)
noChildEnabledChild=false;
if ((*i)->acceptCardAttr(info, attr)) if ((*i)->acceptCardAttr(info, attr))
return true; return true;
} }
return false; return noChildEnabledChild;
} }
bool FilterItemList::testTypeOrNot(const CardInfo *info, CardFilter::Attr attr) const bool FilterItemList::testTypeOrNot(const CardInfo *info, CardFilter::Attr attr) const