From 4ab875be48fb198572075f03ce192157e1d3864d Mon Sep 17 00:00:00 2001
From: "sentry[bot]" <39604003+sentry[bot]@users.noreply.github.com>
Date: Sun, 25 Oct 2026 17:35:46 +0100
Subject: [PATCH] [VisualDeckStorage] Keep databaseLoadIndicator alive when
 swapping in folder widget (#7651)

Co-authored-by: sentry[bot] <39604003+sentry[bot]@users.noreply.github.com>
---
 .../visual_deck_storage_widget.cpp                   | 12 +++++++++++-
 .../visual_deck_storage/visual_deck_storage_widget.h |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
index efcf19e58..4e1d6293f 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
@@ -184,7 +184,9 @@ void VisualDeckStorageWidget::resizeEvent(QResizeEvent *event)
 
 void VisualDeckStorageWidget::retranslateUi()
 {
-    databaseLoadIndicator->setText(tr("Loading database ..."));
+    if (databaseLoadIndicator) {
+        databaseLoadIndicator->setText(tr("Loading database ..."));
+    }
 
     refreshButton->setToolTip(tr("Refresh loaded files"));
     shareButton->setToolTip(tr("Select decks to share"));
@@ -279,6 +281,14 @@ void VisualDeckStorageWidget::createRootFolderWidget()
     folderWidget =
         new VisualDeckStorageFolderDisplayWidget(this, this, QString(), false, quickSettingsWidget->getShowFolders());
 
+    // QScrollArea::setWidget() deletes the widget it currently holds. If that is still the
+    // database load indicator, take it back first so the label stays alive for retranslateUi().
+    if (databaseLoadIndicator && scrollArea->widget() == databaseLoadIndicator) {
+        scrollArea->takeWidget();
+        databaseLoadIndicator->setParent(this);
+        databaseLoadIndicator->setVisible(false);
+    }
+
     scrollArea->setWidget(folderWidget); // this automatically destroys the old folderWidget
     scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width());
     scrollArea->widget()->adjustSize();
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
index b512dd87c..19d16f107 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
@@ -6,6 +6,7 @@
 #ifndef VISUAL_DECK_STORAGE_WIDGET_H
 #define VISUAL_DECK_STORAGE_WIDGET_H
 
+#include <QPointer>
 #include <QSet>
 #include <QString>
 #include <QStringList>
@@ -87,7 +88,7 @@ private:
     QVBoxLayout *layout;
     QWidget *searchAndSortContainer;
     QHBoxLayout *searchAndSortLayout;
-    QLabel *databaseLoadIndicator;
+    QPointer<QLabel> databaseLoadIndicator;
     VisualDeckStorageSortWidget *sortWidget;
     VisualDeckStorageSearchWidget *searchWidget;
     DeckPreviewColorIdentityFilterWidget *deckPreviewColorIdentityFilterWidget;