summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dist/changes-5.13.01
-rw-r--r--src/client/qwaylandwindow.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0
index 1b18ed8fd..2aa76ba85 100644
--- a/dist/changes-5.13.0
+++ b/dist/changes-5.13.0
@@ -109,3 +109,4 @@ information about a particular change.
QScreen::name(), will now typically return "VGA-1", "WL-1", "DP-2",
"HDMI-A-1" and similar instead of "Screen25", "Screen26", "Screen27"
etc. (on supported compositors).
+ - Fixed a crash when closing multiple popups at once.
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 4532bc236..8b2c12277 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -387,7 +387,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();