diff options
| author |   Andy Shaw <andy.shaw@qt.io> | 2024-03-07 08:27:24 +0100 |
|---|---|---|
| committer |   Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-08 20:51:21 +0000 |
| commit | a86cd4dbeeacc42f095db5ada0f0ea59f390465c (patch) | |
| tree | acb860cfcd6e2d2b849308458f8ca368e59108ba | |
| parent | QGlobalStatic: suppress -Wtsan warning (diff) | |
| download | qtbase-a86cd4dbeeacc42f095db5ada0f0ea59f390465c.tar.xz qtbase-a86cd4dbeeacc42f095db5ada0f0ea59f390465c.zip | |
XCB: Unset the connection's mousePressWindow if it's this window
In some rare cases it can delete the window before this is handled by
other calls, so rather than crashing we clean up.
Pick-to: 6.5 6.2 5.15
Change-Id: Iddcd9890f0c13f4130626b0ed9c5b32f5890208d
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit b8f9a8681347476f4db1719b38a67d7f9d3c74be)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit be78514b206aff3152a239c188fcc4e7aba5439a)
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index aad878fed1..6b5532420a 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -540,6 +540,8 @@ void QXcbWindow::destroy() doFocusOut(); if (connection()->mouseGrabber() == this) connection()->setMouseGrabber(nullptr); + if (connection()->mousePressWindow() == this) + connection()->setMousePressWindow(nullptr); if (m_syncCounter && connection()->hasXSync()) xcb_sync_destroy_counter(xcb_connection(), m_syncCounter); |