[Libreoffice-commits] core.git: chart2/source

[Markus Mohrhard]

 chart2/source/view/main/ChartView.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit fc4f5d2f8576097953b83d7fecfe5eb5184811b1
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Jun 12 11:58:45 2014 +0200

    another lifecycle issue fixed
    
    Change-Id: Id8acd1bda30156da8cf5f61537f76f778e1b9c74

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index da62d13..f04433b 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -167,17 +167,19 @@ public:
     virtual void contextDestroyed() SAL_OVERRIDE;
 private:
     ChartView* mpView;
+    bool mbContextDestroyed;
 };
 
 GL2DRenderer::GL2DRenderer(ChartView* pView):
-    mpView(pView)
+    mpView(pView),
+    mbContextDestroyed(false)
 {
 }
 
 GL2DRenderer::~GL2DRenderer()
 {
     OpenGLWindow* pWindow = mpView->mrChartModel.getOpenGLWindow();
-    if(pWindow)
+    if(!mbContextDestroyed &&pWindow)
         pWindow->setRenderer(NULL);
 }
 
@@ -200,6 +202,7 @@ void GL2DRenderer::scroll(long )
 
 void GL2DRenderer::contextDestroyed()
 {
+    mbContextDestroyed = true;
 }
 
 const uno::Sequence<sal_Int8>& ExplicitValueProvider::getUnoTunnelId()