Don't dereference null QQuickWindowPrivate.

windowDestroyed() triggers a sendPostedEvent(DeferredDelete) to
cleanup GL resources. If the window was deleted through deleteLater()
it will also be deleted at this point.

Change-Id: I3b0cc0f36c4a543c5fbaa4af107dc4aa0c8b6725
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index e76aa1bbb5..05302cfe33 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -94,8 +94,12 @@ void QSGRenderLoop::cleanup()
     foreach (QQuickWindow *w, s_instance->windows()) {
         QQuickWindowPrivate *wd = QQuickWindowPrivate::get(w);
         if (wd->windowManager == s_instance) {
+           // windowDestroyed() triggers a sendPostedEvent(DeferredDelete),
+           // so wd will be null if the window was deleteLater()'ed
+           bool wasDeleted = wd->wasDeleted;
            s_instance->windowDestroyed(w);
-           wd->windowManager = 0;
+           if (!wasDeleted)
+               wd->windowManager = 0;
         }
     }
     delete s_instance;