desktop/source/lib/init.cxx | 1 + 1 file changed, 1 insertion(+) New commits: commit 283d7235c8e38d391f450cd725c1e74a35b5a29d Author: Michael Meeks <michael.me...@collabora.com> AuthorDate: Fri May 3 13:36:56 2019 +0100 Commit: Jan Holesovsky <ke...@collabora.com> CommitDate: Fri May 3 16:44:52 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/71742 Reviewed-by: Jan Holesovsky <ke...@collabora.com> Tested-by: Jan Holesovsky <ke...@collabora.com> diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index d4a532f3f33e..1311a014bdc8 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -4626,6 +4626,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; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits