From f5426b2236e00e619f4df963b0fda834724b7e35 Mon Sep 17 00:00:00 2001
From: RickyRister <ricky.rister.wang@gmail.com>
Date: Thu, 6 Nov 2025 18:49:36 -0800
Subject: [PATCH] Move defaultOptions up a level

---
 cockatrice/src/game/player/player_actions.cpp | 6 ++++--
 cockatrice/src/game/zones/hand_zone.cpp       | 6 +-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index 0be605111..388a88e01 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -161,12 +161,14 @@ static QList<CardList::SortOption> expandSortOption(CardList::SortOption option)
 
 void PlayerActions::actSortHand()
 {
-    auto *action = static_cast<QAction *>(sender());
+    auto *action = qobject_cast<QAction *>(sender());
     CardList::SortOption option = static_cast<CardList::SortOption>(action->data().toInt());
 
     QList<CardList::SortOption> sortOptions = expandSortOption(option);
 
-    player->getGraphicsItem()->getHandZoneGraphicsItem()->sortHand(sortOptions);
+    static QList defaultOptions = {CardList::SortByName, CardList::SortByPrinting};
+
+    player->getGraphicsItem()->getHandZoneGraphicsItem()->sortHand(sortOptions + defaultOptions);
 }
 
 void PlayerActions::actViewTopCards()
diff --git a/cockatrice/src/game/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp
index 140c80ff1..860881f38 100644
--- a/cockatrice/src/game/zones/hand_zone.cpp
+++ b/cockatrice/src/game/zones/hand_zone.cpp
@@ -117,11 +117,7 @@ void HandZone::sortHand(const QList<CardList::SortOption> &options)
         return;
     }
 
-    // Implicitly sort by name at the end so that cards with the same name appear together.
-    // Also group printings together
-    static QList defaultOptions = {CardList::SortByName, CardList::SortByPrinting};
-
-    getLogic()->sortCards(options + defaultOptions);
+    getLogic()->sortCards(options);
     reorganizeCards();
 }