1 files changed, 9 insertions, 7 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index e8f96c87..c57339db 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -100,8 +100,16 @@ Bars3DRenderer::Bars3DRenderer(Bars3DController *controller)
 
 Bars3DRenderer::~Bars3DRenderer()
 {
-    fixContextBeforeDelete();
+    contextCleanup();
+    delete m_barShader;
+    delete m_barGradientShader;
+    delete m_depthShader;
+    delete m_selectionShader;
+    delete m_backgroundShader;
+}
 
+void Bars3DRenderer::contextCleanup()
+{
     if (QOpenGLContext::currentContext()) {
         m_textureHelper->glDeleteFramebuffers(1, &m_selectionFrameBuffer);
         m_textureHelper->glDeleteRenderbuffers(1, &m_selectionDepthBuffer);
@@ -109,12 +117,6 @@ Bars3DRenderer::~Bars3DRenderer()
         m_textureHelper->glDeleteFramebuffers(1, &m_depthFrameBuffer);
         m_textureHelper->deleteTexture(&m_bgrTexture);
     }
-
-    delete m_barShader;
-    delete m_barGradientShader;
-    delete m_depthShader;
-    delete m_selectionShader;
-    delete m_backgroundShader;
 }
 
 void Bars3DRenderer::initializeOpenGL()