From d0b840d3c95d6a5a29fbef13842cf1346db07651 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 20 Feb 2014 13:32:20 +0200
Subject: Fix initializing to direct rendering mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic52429ba55035c03de065a94196f4ed4219367ef
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 src/datavisualizationqml2/abstractdeclarative.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index a7935a84..5066666e 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -88,16 +88,17 @@ void AbstractDeclarative::setRenderingMode(AbstractDeclarative::RenderingMode mo
 #else
         setAntialiasing(false);
 #endif
-        if (win && previousMode == RenderIndirect) {
+        if (previousMode == RenderIndirect) {
             update();
             setFlag(ItemHasContents, false);
-
-            QObject::connect(win, &QQuickWindow::beforeRendering, this,
-                             &AbstractDeclarative::render);
-            checkWindowList(win);
-            int samples = win->format().samples();
-            if (samples != m_samples)
-                emit msaaSamplesChanged(samples);
+            if (win) {
+                QObject::connect(win, &QQuickWindow::beforeRendering, this,
+                                 &AbstractDeclarative::render);
+                checkWindowList(win);
+                int samples = win->format().samples();
+                if (samples != m_samples)
+                    emit msaaSamplesChanged(samples);
+            }
         }
 
         break;
-- 
cgit v1.2.3