From f890798053c7fa692bff7f8a3e96583dfcaba0cb Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Wed, 7 Nov 2018 14:19:04 +0100
Subject: Don't crash if view is deleted from surfaceDestroyed signal

Fix regression introduced in 297bcd005c4205f69e1bf9e9dc565ab757cf0bac

Fixes: QTBUG-71643
Change-Id: I769518a9ca13fcd13ea277c7fa8ac1885ca123ba
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
---
 src/compositor/compositor_api/qwaylandview.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

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();
 }
 
 /*!
-- 
cgit v1.2.3