diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-06 16:18:37 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-06 16:18:37 +0200 |
| commit | 88a30a8fe059f758190b73ea6c2c13bb70df07a6 (patch) | |
| tree | 8879d67e687b7a90e12a84df4363fcc537752925 /src/compositor/compositor_api/qwaylandoutput.cpp | |
| parent | 6d927bc43b4b0bdbf38521c1cad81d997980ae5b (diff) | |
| parent | c3b6c4d442c8187e43601c548bc58ce3e4fe21f3 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I06b86b413984c07f6be98120450bc859dab271c1
Diffstat (limited to 'src/compositor/compositor_api/qwaylandoutput.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandoutput.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp index c9cc5a136..17c56cfdc 100644 --- a/src/compositor/compositor_api/qwaylandoutput.cpp +++ b/src/compositor/compositor_api/qwaylandoutput.cpp @@ -944,7 +944,10 @@ void QWaylandOutput::surfaceLeave(QWaylandSurface *surface) { if (!surface || !surface->client()) return; - QWaylandSurfacePrivate::get(surface)->send_leave(resourceForClient(surface->client())); + + auto *clientResource = resourceForClient(surface->client()); + if (clientResource) + QWaylandSurfacePrivate::get(surface)->send_leave(clientResource); } /*! |