From 941c40c4cfd2ffb693ffa7f0a3c894c71374048f Mon Sep 17 00:00:00 2001 From: RickyRister Date: Sat, 11 Jan 2025 16:12:23 -0800 Subject: [PATCH] send closeRequest --- cockatrice/src/client/tabs/tab_supervisor.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp index 27320218b..03611c1cf 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.cpp +++ b/cockatrice/src/client/tabs/tab_supervisor.cpp @@ -304,30 +304,27 @@ void TabSupervisor::stop() tabAdmin = 0; tabLog = 0; - for (const auto tab : deckEditorTabs) { - disconnect(tab, nullptr, this, nullptr); - tab->deleteLater(); - } - deckEditorTabs.clear(); + QList tabsToDelete; for (auto i = roomTabs.cbegin(), end = roomTabs.cend(); i != end; ++i) { - disconnect(i.value(), nullptr, this, nullptr); - i.value()->deleteLater(); + tabsToDelete << i.value(); } roomTabs.clear(); for (auto i = gameTabs.cbegin(), end = gameTabs.cend(); i != end; ++i) { - disconnect(i.value(), nullptr, this, nullptr); - i.value()->deleteLater(); + tabsToDelete << i.value(); } gameTabs.clear(); for (const auto tab : replayTabs) { - disconnect(tab, nullptr, this, nullptr); - tab->deleteLater(); + tabsToDelete << tab; } replayTabs.clear(); + for (const auto tab : tabsToDelete) { + tab->closeRequest(true); + } + delete userInfo; userInfo = 0; }