[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/source

[Tor Lillqvist]

 desktop/source/lib/init.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2447b5ef00d0e3e3cc9dabe7ab29ce0ec118d9f2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Oct 19 17:58:08 2016 +0300

    Avoid deadlock in CppunitTest_libreofficekit_tiledrendering
    
    Change-Id: Ief6f39400381764a5f41812a045ff2477aaecaeb

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e6a9303..ab7b557 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);