From 2e4246ee71dd6689d3731e380f393185a1e3bd8e Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 5 Jun 2019 13:10:38 +0200 Subject: Client: Don't add all windows to activePopups 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 (cherry picked from commit af9ec8a76d7e62444fadb518256fc58723fe5186) --- dist/changes-5.12.4 | 1 + 1 file changed, 1 insertion(+) (limited to 'dist') diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4 index 0fb380308..672b9a7c1 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. -- cgit v1.2.3