summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dist/changes-5.12.41
-rw-r--r--src/client/qwaylandwindow.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4
index 0fb38030..672b9a7c 100644
--- a/dist/changes-5.12.4
+++ b/dist/changes-5.12.4
@@ -37,3 +37,4 @@ information about a particular change.
parent.
- Fixed a protocol error when an application tried to render to a window
before a shell or sub-surface was created.
+ - Fixed a crash when closing multiple popups at once.
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 58e0fc58..cecdbda9 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -393,7 +393,7 @@ QWaylandScreen *QWaylandWindow::calculateScreenFromSurfaceEvents() const
void QWaylandWindow::setVisible(bool visible)
{
if (visible) {
- if (window()->type() & (Qt::Popup | Qt::ToolTip))
+ if (window()->type() == Qt::Popup || window()->type() == Qt::ToolTip)
activePopups << this;
initWindow();
mDisplay->flushRequests();