diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp b/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp index cdedd19e8..648906960 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp +++ b/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp @@ -83,21 +83,26 @@ QImage PictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName, QImageReader imgReader; imgReader.setDecideFormatFromContent(true); + // Most-to-least specific, these will fall through in order. QStringList nameVariants; + // cardName_providerId if (!providerId.isEmpty()) { nameVariants << QString("%1-%2").arg(correctedCardName, providerId) << QString("%1_%2").arg(correctedCardName, providerId); } + // cardName_setName_collectorNumber & setName-collectorNumber-cardName if (!setName.isEmpty() && !collectorNumber.isEmpty()) { nameVariants << QString("%1_%2_%3").arg(correctedCardName, setName, collectorNumber) << QString("%1-%2-%3").arg(setName, collectorNumber, correctedCardName); } + // cardName_setName if (!setName.isEmpty()) { nameVariants << QString("%1_%2").arg(correctedCardName, setName) << QString("%1-%2").arg(setName, correctedCardName); } + // cardName nameVariants << correctedCardName; for (const QString &nameVariant : nameVariants) {