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

check multiple file extension inclusions for custom cards (#4308)

Browse source
This commit is contained in:
ebbit1q 2021-04-16 17:23:46 +02:00 committed by GitHub
parent ad0f313c9d
commit 5969656429
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/pictureloader.cpp
View file

@ -196,8 +196,11 @@ bool PictureLoaderWorker::cardImageExistsOnDisk(QString &setName, QString &corre
QString thisPath(it.next()); QString thisPath(it.next());
QFileInfo thisFileInfo(thisPath); QFileInfo thisFileInfo(thisPath);
if (thisFileInfo.isFile() && thisFileInfo.baseName() == correctedCardname) if (thisFileInfo.isFile() &&
(thisFileInfo.fileName() == correctedCardname || thisFileInfo.completeBaseName() == correctedCardname ||
thisFileInfo.baseName() == correctedCardname)) {
picsPaths << thisPath; // Card found in the CUSTOM directory, somewhere picsPaths << thisPath; // Card found in the CUSTOM directory, somewhere
}
} }
if (!setName.isEmpty()) { if (!setName.isEmpty()) {