diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-17 15:18:10 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:23:05 +0200 |
| commit | 91fb34e5bb8616e4fe7d30786d59c5383d8aa4e1 (patch) | |
| tree | c4d1a99e8637df919be19ee9eb253bc402f3d750 /chart2 | |
| parent | 999c01c133640d366d1ab28e5686b36cb2976fc4 (diff) | |
Some missing SolarMutexGuard around VclPtr acquire/release
At least OutputDevice::acquire/release use a plain unguarded int and ++, --, so
apparently rely on the SolarMutex being locked whenever they are called. Fixed
those places that caused "make check" to fail for me when temporarily adding
DBG_TESTSOLARMUTEX() to OutputDevice::acquire/release. (A recurring pattern is
that a class fails to ensure the SolarMutex is locked around the destruction of
non-null VclPtr members.)
Change-Id: I77cba6f3908f2de1b516ce28f1c3c43b3f57a9c5
(cherry picked from commit 8e1ad966262932516b3368d9b5c44becb29524d4)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/view/main/ChartView.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index b95b5ab8fbc4..3510549abcf9 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1103,8 +1103,10 @@ GL2DRenderer::GL2DRenderer(ChartView* pView): GL2DRenderer::~GL2DRenderer() { + SolarMutexGuard g; if(!mbContextDestroyed && mpWindow) mpWindow->setRenderer(NULL); + mpWindow.reset(); } void GL2DRenderer::update() |