poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

core/menu: correctly handle menu destruction while open

Browse source
This commit is contained in:
outfoxxed 2024-12-05 19:46:08 -08:00
parent 26280b34b4
commit 2d05c7a89e
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/core/qsmenuanchor.cpp
View file

@ -78,8 +78,17 @@ void QsMenuAnchor::onClosed() {
this->platformMenu = nullptr; this->platformMenu = nullptr;
} }
QObject::disconnect(this->mMenu, &QsMenuHandle::menuChanged, this, &QsMenuAnchor::onMenuChanged); if (this->mMenu) {
this->mMenu->unrefHandle(); QObject::disconnect(
this->mMenu,
&QsMenuHandle::menuChanged,
this,
&QsMenuAnchor::onMenuChanged
);
this->mMenu->unrefHandle();
}
emit this->closed(); emit this->closed();
emit this->visibleChanged(); emit this->visibleChanged();
} }
@ -109,6 +118,7 @@ bool QsMenuAnchor::isVisible() const { return this->mOpen; }
void QsMenuAnchor::onMenuDestroyed() { void QsMenuAnchor::onMenuDestroyed() {
this->mMenu = nullptr; this->mMenu = nullptr;
this->onClosed();
emit this->menuChanged(); emit this->menuChanged();
} }