[Libreoffice-commits] core.git: desktop/source

[Michael Meeks (via logerrit)]

 desktop/source/lib/init.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit a6da211e3c199ff73cbe24d93f8c0292c3c983b6
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri May 3 13:36:56 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri May 3 15:29:48 2019 +0200

    unipoll: get SolarMutex lock counting right.
    
    lo_startmain drops the SolarMutex without taking it, interestingly.
    
    Change-Id: I2280e2fa6acb8739f970983032db72a8241d1c4f
    Reviewed-on: https://gerrit.libreoffice.org/71741
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 497c31b34101..da2d44f5a8dd 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4516,6 +4516,7 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/,
     SolarMutexGuard aGuard;
     vcl::lok::registerPollCallbacks(pPollCallback, pWakeCallback, pData);
     lo_startmain(nullptr);
+    Application::AcquireSolarMutex(1); // startmain releases it.
 }
 
 static bool bInitialized = false;