diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-10-19 17:58:08 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-10-19 17:58:08 +0300 |
| commit | 2447b5ef00d0e3e3cc9dabe7ab29ce0ec118d9f2 (patch) | |
| tree | 9245e21bb2c0e37d519fdba28cd353a70d002fb3 /desktop/source | |
| parent | eb69d8cb5eb6192de89ca8310a53ae7a434a73d1 (diff) | |
Avoid deadlock in CppunitTest_libreofficekit_tiledrendering
Change-Id: Ief6f39400381764a5f41812a045ff2477aaecaeb
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index e6a93031a8f4..ab7b557def20 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2913,7 +2913,7 @@ int lok_preinit(const char* install_path, const char* user_profile_path) static void lo_destroy(LibreOfficeKit* pThis) { - SolarMutexGuard aGuard; + SolarMutexClearableGuard aGuard; bool bSuccess = false; LibLibreOffice_Impl* pLib = static_cast<LibLibreOffice_Impl*>(pThis); @@ -2935,6 +2935,8 @@ static void lo_destroy(LibreOfficeKit* pThis) Application::Quit(); } + aGuard.clear(); + osl_joinWithThread(pLib->maThread); osl_destroyThread(pLib->maThread); |