summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2019-05-03 13:36:56 +0100
committerMichael Meeks <michael.meeks@collabora.com>2019-05-03 15:29:48 +0200
commita6da211e3c199ff73cbe24d93f8c0292c3c983b6 (patch)
tree730f4863e4817afb30c7598db9a60f29e9cbb327 /desktop
parent2341569fb082d914fd70b3b93af6346715efaddd (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/71741 Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx1
1 files changed, 1 insertions, 0 deletions
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;