From 92d082e7353a9b0f2bc4fc14f2cb1cf6493a31aa Mon Sep 17 00:00:00 2001
From: "sentry[bot]" <39604003+sentry[bot]@users.noreply.github.com>
Date: Tue, 27 Oct 2026 09:14:52 +0100
Subject: [PATCH] [VisualDeckStorage] Guard against widget deletion during tag
 edit dialog (#7674)

Co-authored-by: sentry[bot] <39604003+sentry[bot]@users.noreply.github.com>
---
 .../deck_preview/deck_preview_deck_tags_display_widget.cpp  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
index 4e6e7cc05..1a06c0b18 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
@@ -12,6 +12,7 @@
 
 #include <QDialog>
 #include <QDir>
+#include <QPointer>
 #include <QDirIterator>
 #include <QHBoxLayout>
 #include <QSizePolicy>
@@ -117,8 +118,13 @@ void DeckPreviewDeckTagsDisplayWidget::openTagEditDlg()
 
 void DeckPreviewDeckTagsDisplayWidget::execTagDialog(const QStringList &knownTags)
 {
+    QPointer<DeckPreviewDeckTagsDisplayWidget> self(this);
     DeckPreviewTagDialog dialog(knownTags, currentTags);
     if (dialog.exec() == QDialog::Accepted) {
+        // Guard against the widget being destroyed during dialog.exec()'s nested event loop.
+        if (!self) {
+            return;
+        }
         QStringList updatedTags = dialog.getActiveTags();
         if (updatedTags != currentTags) {
             setTags(updatedTags);