From e28e30061258b6e392d438c7be14e80eab5effe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Thu, 25 Sep 2025 11:38:26 +0200 Subject: [PATCH] Clean up getCardFromSameSet. Took 2 minutes --- cockatrice/src/database/card_database.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cockatrice/src/database/card_database.cpp b/cockatrice/src/database/card_database.cpp index 757d2362e..13d2ef1a3 100644 --- a/cockatrice/src/database/card_database.cpp +++ b/cockatrice/src/database/card_database.cpp @@ -334,14 +334,10 @@ ExactCard CardDatabase::getCardFromSameSet(const QString &cardName, const Printi // The source card does have a printing defined, which means we can attempt to get a card from the same set. PrintingInfo relatedPrinting = getSpecificPrinting(cardName, otherPrinting.getSet()->getCorrectedShortName(), ""); - ExactCard relatedCard = ExactCard(guessCard({cardName}).getCardPtr(), relatedPrinting); + ExactCard relatedCard(guessCard({cardName}).getCardPtr(), relatedPrinting); - // We didn't find a card from the same set, just try to find any card with the same name. - if (!relatedCard) { - return getCard({cardName}); - } - - return relatedCard; + // If we didn't find a card from the same set, just try to find any card with the same name. + return relatedCard ? relatedCard : getCard({cardName}); } CardSetPtr CardDatabase::getSet(const QString &setName)