diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:20:49 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:20:49 +0100 |
| commit | 4165d11adc6eb28e98742d3cd4ebd96865b5a2fe (patch) | |
| tree | 979c47d94009d45c6403f50d4ec260f07d8cab02 /src/compositor | |
| parent | 4aeb655d161250c317bdb5a6a86e6a6b01ef5685 (diff) | |
| parent | f890798053c7fa692bff7f8a3e96583dfcaba0cb (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: Ica38060e6d624a7534660eabec604f6795970c95
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandview.cpp b/src/compositor/compositor_api/qwaylandview.cpp index 127593770..1a6bf1a64 100644 --- a/src/compositor/compositor_api/qwaylandview.cpp +++ b/src/compositor/compositor_api/qwaylandview.cpp @@ -56,8 +56,10 @@ void QWaylandViewPrivate::markSurfaceAsDestroyed(QWaylandSurface *surface) Q_ASSERT(surface == this->surface); setSurface(nullptr); + QPointer<QWaylandView> deleteGuard(q); emit q->surfaceDestroyed(); - clearFrontBuffer(); + if (!deleteGuard.isNull()) + clearFrontBuffer(); } /*! |