From a01694da92feedb0b4e791cad8c5b46d5e10d5cb Mon Sep 17 00:00:00 2001
From: RickyRister <ricky.rister.wang@gmail.com>
Date: Fri, 29 Nov 2024 00:12:22 -0800
Subject: [PATCH] prevent overlapping sort properties

---
 cockatrice/src/game/zones/view_zone_widget.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp
index 16990a7c2..a51acb0c2 100644
--- a/cockatrice/src/game/zones/view_zone_widget.cpp
+++ b/cockatrice/src/game/zones/view_zone_widget.cpp
@@ -141,11 +141,25 @@ void ZoneViewWidget::processGroupBy(int index)
     auto option = static_cast<CardList::SortOption>(groupBySelector.itemData(index).toInt());
     SettingsCache::instance().setZoneViewGroupBy(option);
     zone->setGroupBy(option);
+
+    // reset sortBy if it has the same value as groupBy
+    if (option != CardList::NoSort &&
+        option == static_cast<CardList::SortOption>(sortBySelector.currentData().toInt())) {
+        sortBySelector.setCurrentIndex(1); // set to SortByName
+    }
 }
 
 void ZoneViewWidget::processSortBy(int index)
 {
     auto option = static_cast<CardList::SortOption>(sortBySelector.itemData(index).toInt());
+
+    // set to SortByName instead if it has the same value as groupBy
+    if (option != CardList::NoSort &&
+        option == static_cast<CardList::SortOption>(groupBySelector.currentData().toInt())) {
+        sortBySelector.setCurrentIndex(1); // set to SortByName
+        return;
+    }
+
     SettingsCache::instance().setZoneViewSortBy(option);
     zone->setSortBy(option);
 }