From 884579529dcc6e722c0f0d270121202dde111f51 Mon Sep 17 00:00:00 2001 From: Matt Lowe Date: Fri, 10 Apr 2015 00:46:11 +0200 Subject: [PATCH] Fixed deck tokens showing in token dlg Tokens from decks will now show in the token dlg window --- cockatrice/src/carddatabasemodel.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cockatrice/src/carddatabasemodel.cpp b/cockatrice/src/carddatabasemodel.cpp index fca39c79..2c6d658b 100644 --- a/cockatrice/src/carddatabasemodel.cpp +++ b/cockatrice/src/carddatabasemodel.cpp @@ -156,6 +156,10 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex if (!CardInfo::simplifyName(info->getName()).contains(cardName, Qt::CaseInsensitive)) return false; + if (!cardNameSet.isEmpty()) + if (!cardNameSet.contains(info->getName())) + return false; + if (filterTree != NULL) return filterTree->acceptsCard(info);