summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-06-05 13:10:38 +0200
committerJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-06-06 08:54:51 +0200
commit79037e46eeb00e20c5f3bbe7d0de4b702af86884 (patch)
treedf3d08703007e1b3ffa6e0471f1ec41dbd798bc5
parent1aba2b28920229aa547470a6c3f3b443d7da6b3a (diff)
Client: Don't add all windows to activePopupsv5.13.0-rc3v5.13.0-rc2v5.13.05.13.0
Neither Qt::ToolTip nor Qt::Popup are single bits in Qt::WindowFlags, and do in fact include Qt::Window. This meant that when we or'ed them and did a bitwise and with QWindow::type(), we would match more types than just Qt::Popup and Qt::ToolTip. We would for instance get any Qt::Window as well, which meant the main window would be added to activePopups, leading to strange things happening, such as crashes and the main window closing unexpectedly. [ChangeLog][QPA plugin] Fixed a crash when closing multiple popups at once. Fixes: QTBUG-76124 Change-Id: I1a6a59e161a436604a7ac8ab824396481dc99a20 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit af9ec8a76d7e62444fadb518256fc58723fe5186)
-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 1b18ed8f..2aa76ba8 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 4532bc23..8b2c1227 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();