From 773f186a7fde4c6a4db67e9ca7f691461d2bf763 Mon Sep 17 00:00:00 2001 From: Syarif Fakhri Date: Wed, 14 Sep 2022 12:34:13 +0800 Subject: [PATCH] Fix crash when restoring state but better - Rather than having to check for nullptr, just make sure the slot isn't called --- src/OverlayDockContainer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/OverlayDockContainer.cpp b/src/OverlayDockContainer.cpp index 1aca25e..c46dc61 100644 --- a/src/OverlayDockContainer.cpp +++ b/src/OverlayDockContainer.cpp @@ -196,9 +196,6 @@ COverlayDockContainer::~COverlayDockContainer() { ADS_PRINT("~COverlayDockContainer"); - // Remove event filter in case there are any queued messages - parent()->removeEventFilter(this); - if (d->DockManager) { parentContainer()->removeOverlayWidget(this); @@ -312,6 +309,10 @@ void COverlayDockContainer::cleanupAndDelete() dockWidget->sideTabWidget()->setParent(dockWidget); dockWidget->sideTabWidget()->hide(); } + + // Remove event filter in case there are any queued messages + parent()->removeEventFilter(this); + hide(); deleteLater(); }