diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2021-09-14 11:56:23 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-24 13:21:37 +0000 |
| commit | a9cadc1dcfb282bec1a3ca01f2f4d93b9999e4f3 (patch) | |
| tree | 70fb7af06f255f9fb44eabccb685b9411ced2eb3 | |
| parent | ecb6008afa8fa16449ead5b395ea10f6fdbab98a (diff) | |
| download | qtwayland-a9cadc1dcfb282bec1a3ca01f2f4d93b9999e4f3.tar.gz | |
Wayland client: Fix crash when windows are shown/hidden during drag
Fixes: QTBUG-87624
Change-Id: I1b9443df091878abcd4fbe9c55927cb819aebd59
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit c64c5d3849b40617e1de0295f8690f354cab2b3a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/client/qwaylanddatadevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp index 3705bf64..78acc5cd 100644 --- a/src/client/qwaylanddatadevice.cpp +++ b/src/client/qwaylanddatadevice.cpp @@ -168,7 +168,7 @@ void QWaylandDataDevice::data_device_drop() void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface, wl_fixed_t x, wl_fixed_t y, wl_data_offer *id) { - auto *dragWaylandWindow = QWaylandWindow::fromWlSurface(surface); + auto *dragWaylandWindow = surface ? QWaylandWindow::fromWlSurface(surface) : nullptr; if (!dragWaylandWindow) return; // Ignore foreign surfaces |