diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-12-16 16:06:42 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-17 22:20:22 +0100 |
| commit | 69ba498b4cfd2b25ddc1c84f83d376d11c321fce (patch) | |
| tree | 86d60102b385976cca80e7ae0efc4056cb55c2a6 /vcl | |
| parent | 98bc62b140a2692bef467452f000421e51b9a1f0 (diff) | |
Properly join spawned GrammarCheckingIterator thread.
It was still running during shutdown of sw_complex's checkFlies test, causing
problems.
For this to work, Desktop::DeInit needs to be called with SolarMutex unlocked,
which looks like the right way, anyway. Hopefully it does not unearth another
round of bugs...
(cherry picked from commit c5cf78e1529970c04e1999e1f96f3e374ecd211e)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/svmain.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 5ab01b9ca3e6..cf98fb8a0b6a 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -489,10 +489,14 @@ void DeInitVCL() pSVData->maAppData.mxMSF.clear(); if( pSVData->mpApp ) + { + sal_uLong nCount = Application::ReleaseSolarMutex(); // call deinit to deinitialize application class // soffice/sfx implementation disposes the global service manager // Warning: After this call you can't call uno services pSVData->mpApp->DeInit(); + Application::AcquireSolarMutex(nCount); + } if ( pSVData->maAppData.mpSettings ) { |