diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2018-11-07 14:19:04 +0100 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-11-07 17:09:11 +0000 |
commit | f890798053c7fa692bff7f8a3e96583dfcaba0cb (patch) | |
tree | 322ea95a6e0da7f1c92e97dc67911c046f996f9b /src | |
parent | 88eb34213b35bfac292397e784ac20341f216ab4 (diff) | |
download | qtwayland-f890798053c7fa692bff7f8a3e96583dfcaba0cb.tar.gz |
Don't crash if view is deleted from surfaceDestroyed signalv5.12.0-rc2v5.12.0-rc1v5.12.05.12.0
Fix regression introduced in 297bcd005c4205f69e1bf9e9dc565ab757cf0bac
Fixes: QTBUG-71643
Change-Id: I769518a9ca13fcd13ea277c7fa8ac1885ca123ba
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src')
-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 12759377..1a6bf1a6 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(); } /*! |