From 96f373e26ca4632c15dfcb30b14d92714c484313 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@collabora.co.uk>
Date: Wed, 23 Jul 2014 22:49:17 +0200
Subject: avoid deadlock in 3D charts

taking the mutex before calling join is silly

Change-Id: I5a2df82f748aa7ccd13824369da5c81842285076
---
 chart2/source/view/charttypes/GL3DBarChart.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'chart2')

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 733d46fefd7a..e3aef22c79e1 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -509,10 +509,10 @@ public:
 
 void GL3DBarChart::moveToDefault()
 {
-    osl::MutexGuard aGuard(maMutex);
     if(mpRenderThread.is())
         mpRenderThread->join();
 
+    osl::MutexGuard aGuard(maMutex);
     Size aSize = mrWindow.GetSizePixel();
     mrWindow.getContext().setWinSize(aSize);
     mpRenderThread = rtl::Reference<RenderThread>(new RenderAnimationThread(this, maCameraPosition, maDefaultCameraPosition, STEPS));
-- 
cgit