diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2019-05-03 13:36:56 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2019-05-03 16:44:52 +0200 |
commit | 283d7235c8e38d391f450cd725c1e74a35b5a29d (patch) | |
tree | a88c2a31c2495099f707cf358f5f8e64ff536507 /desktop | |
parent | 404c1203ceec07afbf3fcf274e2cc8a4361e2588 (diff) |
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 <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/lib/init.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
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; |