core/menu: correctly handle menu destruction while open

quickshell-mirror · Dec 6, 2024 · 2d05c7a · 2d05c7a
1 parent 26280b3
commit 2d05c7a
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/core/qsmenuanchor.cpp b/src/core/qsmenuanchor.cpp
@@ -78,8 +78,17 @@ void QsMenuAnchor::onClosed() {
 		this->platformMenu = nullptr;
 	}
 
-	QObject::disconnect(this->mMenu, &QsMenuHandle::menuChanged, this, &QsMenuAnchor::onMenuChanged);
-	this->mMenu->unrefHandle();
+	if (this->mMenu) {
+		QObject::disconnect(
+		    this->mMenu,
+		    &QsMenuHandle::menuChanged,
+		    this,
+		    &QsMenuAnchor::onMenuChanged
+		);
+
+		this->mMenu->unrefHandle();
+	}
+
 	emit this->closed();
 	emit this->visibleChanged();
 }
@@ -109,6 +118,7 @@ bool QsMenuAnchor::isVisible() const { return this->mOpen; }
 
 void QsMenuAnchor::onMenuDestroyed() {
 	this->mMenu = nullptr;
+	this->onClosed();
 	emit this->menuChanged();
 }