Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
88da9ec8
Commit
88da9ec8
authored
Apr 10, 2015
by
poixen
Browse files
Merge pull request #938 from poixen/load_token_fix
Fixed deck tokens showing in token dlg
parents
ef09f45c
88457952
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/carddatabasemodel.cpp
View file @
88da9ec8
...
...
@@ -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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment