From 006476b4c61e5810d3aef6689af43bb1c923b8bd Mon Sep 17 00:00:00 2001
From: Cameron McDonald <cameronhimself@gmail.com>
Date: Thu, 15 Aug 2024 19:45:16 -0500
Subject: [PATCH] remove priority fallback ternary from CardSet model

---
 cockatrice/src/game/cards/card_database.cpp | 6 ++++--
 cockatrice/src/game/cards/card_database.h   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cockatrice/src/game/cards/card_database.cpp b/cockatrice/src/game/cards/card_database.cpp
index 26df7f0f0..475634c9f 100644
--- a/cockatrice/src/game/cards/card_database.cpp
+++ b/cockatrice/src/game/cards/card_database.cpp
@@ -214,15 +214,17 @@ void SetList::defaultSort()
         QDate distantPast = QDate(1970, 1, 1);
         QDate aDate = a->getReleaseDate().isValid() ? a->getReleaseDate() : distantPast;
         QDate bDate = b->getReleaseDate().isValid() ? b->getReleaseDate() : distantPast;
+        CardSet::Priority aPriority = a->getPriority() ? a->getPriority() : CardSet::PriorityFallback;
+        CardSet::Priority bPriority = b->getPriority() ? b->getPriority() : CardSet::PriorityFallback;
 
         // Sort by priority, then by release date, then by short name
-        if (a->getPriority() == b->getPriority()) {
+        if (aPriority == bPriority) {
             if (aDate.daysTo(bDate) == 0) {
                 return a->getShortName().compare(b->getShortName()) < 0;
             }
             return aDate.daysTo(bDate) < 0;
         }
-        return a->getPriority() < b->getPriority();
+        return aPriority < bPriority;
     });
 }
 
diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/game/cards/card_database.h
index ab0fbbba2..9dcbc47b9 100644
--- a/cockatrice/src/game/cards/card_database.h
+++ b/cockatrice/src/game/cards/card_database.h
@@ -79,7 +79,7 @@ public:
     }
     Priority getPriority() const
     {
-        return priority ? priority : PriorityFallback;
+        return priority;
     }
     void setLongName(const QString &_longName)
     {