diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-07-23 22:49:17 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-07-23 22:58:09 +0200 |
| commit | 96f373e26ca4632c15dfcb30b14d92714c484313 (patch) | |
| tree | 769c4099dce450b30e43c9e5ea00c4255fe6baa3 | |
| parent | 1b2f1147130a8546e8b007ead26df3425d5cf2ed (diff) | |
avoid deadlock in 3D charts
taking the mutex before calling join is silly
Change-Id: I5a2df82f748aa7ccd13824369da5c81842285076
| -rw-r--r-- | chart2/source/view/charttypes/GL3DBarChart.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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)); |