From f15bcc41a2be8aa2267f4abf23e99bac72b594b4 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Mon, 9 Jun 2014 15:52:53 +0300
Subject: Fix selectedElement qmldesigner crash
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also fix some minor inconsistencies in the API.

Change-Id: Ia31321a1f70d132173a909fef68fd3b59e06e080
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 src/datavisualization/engine/abstract3dcontroller.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/datavisualization')

diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 8658d463..30434dca 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -1481,7 +1481,10 @@ QCustom3DItem *Abstract3DController::selectedCustomItem() const
 
 QAbstract3DGraph::ElementType Abstract3DController::selectedElement() const
 {
-    return m_renderer->clickedType();
+    if (m_renderer)
+        return m_renderer->clickedType();
+    else
+        return QAbstract3DGraph::ElementNone;
 }
 
 void Abstract3DController::setOrthoProjection(bool enable)
-- 
cgit v1.2.3