From 2933f37f851316b8ede6ab74d45fd101cf42e34c Mon Sep 17 00:00:00 2001
From: ebbit1q <ebbit1q@gmail.com>
Date: Wed, 4 Mar 2026 00:10:02 +0100
Subject: [PATCH] set warning and properly set timer

---
 .../interface/widgets/general/home_widget.cpp | 44 ++++++++++---------
 .../interface/widgets/general/home_widget.h   |  1 +
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp
index f8e181a09..e810c5ccd 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/home_widget.cpp
@@ -58,20 +58,23 @@ void HomeWidget::initializeBackgroundFromSource()
 
     auto backgroundSourceType = BackgroundSources::fromId(SettingsCache::instance().getHomeTabBackgroundSource());
 
-    cardChangeTimer->stop();
-
     switch (backgroundSourceType) {
         case BackgroundSources::Theme:
+            cardChangeTimer->stop();
             background = QPixmap("theme:backgrounds/home");
+            backgroundSourceDeck = DeckList();
             updateButtonsToBackgroundColor();
             update();
             break;
         case BackgroundSources::RandomCardArt:
-            cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
+            backgroundSourceDeck = DeckList();
+            updateRandomCard();
+            onBackgroundShuffleFrequencyChanged();
             break;
         case BackgroundSources::DeckFileArt:
             loadBackgroundSourceDeck();
-            cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
+            updateRandomCard();
+            onBackgroundShuffleFrequencyChanged();
             break;
     }
 }
@@ -83,6 +86,20 @@ void HomeWidget::loadBackgroundSourceDeck()
     backgroundSourceDeck = deckOpt.has_value() ? deckOpt.value().deckList : DeckList();
 }
 
+void HomeWidget::setRandomCard(ExactCard &newCard)
+{
+    static constexpr int ATTEMPTS = 10;
+    for (int i = 0; i < ATTEMPTS; ++i) {
+        ExactCard tmpCard = CardDatabaseManager::query()->getRandomCard();
+        if (tmpCard != backgroundSourceCard->getCard() && tmpCard.getCardPtr()->getProperty("layout") == "normal" &&
+            tmpCard.getPrinting().getSet() != nullptr) {
+            newCard = tmpCard;
+            return;
+        }
+    }
+    qWarning() << "failed to set random card image after" << ATTEMPTS << "attempts";
+}
+
 void HomeWidget::updateRandomCard()
 {
     auto backgroundSourceType = BackgroundSources::fromId(SettingsCache::instance().getHomeTabBackgroundSource());
@@ -93,15 +110,7 @@ void HomeWidget::updateRandomCard()
         case BackgroundSources::Theme:
             break;
         case BackgroundSources::RandomCardArt:
-            for (int i = 0; i < 10; ++i) {
-                ExactCard tmpCard = CardDatabaseManager::query()->getRandomCard();
-                if (tmpCard != backgroundSourceCard->getCard() &&
-                    tmpCard.getCardPtr()->getProperty("layout") == "normal" &&
-                    tmpCard.getPrinting().getSet() != nullptr) {
-                    newCard = tmpCard;
-                    break;
-                }
-            }
+            setRandomCard(newCard);
             break;
         case BackgroundSources::DeckFileArt:
             QList<CardRef> cardRefs = backgroundSourceDeck.getCardRefList();
@@ -130,19 +139,14 @@ void HomeWidget::updateRandomCard()
     connect(newCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &HomeWidget::updateBackgroundProperties);
     backgroundSourceCard->setCard(newCard);
     background = backgroundSourceCard->getProcessedBackground(size());
-
-    if (SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() <= 0) {
-        cardChangeTimer->stop();
-    }
 }
 
 void HomeWidget::onBackgroundShuffleFrequencyChanged()
 {
     cardChangeTimer->stop();
-    if (SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() <= 0) {
-        return;
+    if (SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() > 0) {
+        cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
     }
-    cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
 }
 
 void HomeWidget::updateBackgroundProperties()
diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h
index 233fda543..b30bb5407 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.h
+++ b/cockatrice/src/interface/widgets/general/home_widget.h
@@ -45,6 +45,7 @@ private:
     QPair<QColor, QColor> gradientColors;
     HomeStyledButton *connectButton;
 
+    void setRandomCard(ExactCard &newCard);
     void loadBackgroundSourceDeck();
 };