Merge remote-tracking branch 'origin/5.11' into 5.12

Change-Id: Ieaf0811cf045af1e6df4db4ab67d7c38ba0d1fbf

1 files changed, 7 insertions, 5 deletions

diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index 79bfe95e90..3d579fde46 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -351,11 +351,16 @@ void QSGGuiThreadRenderLoop::windowDestroyed(QQuickWindow *window)
 
 void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
 {
-    QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
-    if (!cd->isRenderable() || !m_windows.contains(window))
+    if (!m_windows.contains(window))
         return;
 
     WindowData &data = const_cast<WindowData &>(m_windows[window]);
+    bool alsoSwap = data.updatePending;
+    data.updatePending = false;
+
+    QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
+    if (!cd->isRenderable())
+        return;
 
     bool current = false;
 
@@ -382,9 +387,6 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
         current = gl->makeCurrent(window);
     }
 
-    bool alsoSwap = data.updatePending;
-    data.updatePending = false;
-
     bool lastDirtyWindow = true;
     auto i = m_windows.constBegin();
     while (i != m_windows.constEnd()) {