3 files changed, 12 insertions, 2 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index d2b59c58..acb63f0a 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -81,13 +81,19 @@ Abstract3DController::Abstract3DController(QRect initialViewport, Q3DScene *scen
 
 Abstract3DController::~Abstract3DController()
 {
+    destroyRenderer();
+    delete m_scene;
+    delete m_themeManager;
+}
+
+void Abstract3DController::destroyRenderer()
+{
     // Renderer can be in another thread, don't delete it directly in that case
     if (m_renderer && m_renderer->thread() != QThread::currentThread())
         m_renderer->deleteLater();
     else
         delete m_renderer;
-    delete m_scene;
-    delete m_themeManager;
+    m_renderer = 0;
 }
 
 /**
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index f9b6588d..5bae17d6 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -161,6 +161,7 @@ public:
     virtual ~Abstract3DController();
 
     inline bool isInitialized() { return (m_renderer != 0); }
+    virtual void destroyRenderer();
     virtual void synchDataToRenderer();
     virtual void render(const GLuint defaultFboHandle = 0);
     virtual void initializeOpenGL() = 0;
diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index 1551c639..cce2c235 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -450,6 +450,9 @@ QAbstract3DGraphPrivate::QAbstract3DGraphPrivate(QAbstract3DGraph *q)
 
 QAbstract3DGraphPrivate::~QAbstract3DGraphPrivate()
 {
+    if (m_context)
+        m_context->makeCurrent(q_ptr);
+
     delete m_visualController;
 }