summaryrefslogtreecommitdiff
path: root/desktop/source/lib/init.cxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-06-14 18:38:51 +0200
committerJan Holesovsky <kendy@collabora.com>2019-06-17 07:00:33 +0200
commit38f614746318913305fcce5a678d9cd26e52013c (patch)
tree094809e5eb53a90d9bffcc2bb920d434c08926fb /desktop/source/lib/init.cxx
parent4fe407485f7c42f27101794594635ecf13d13826 (diff)
android: Unregistering in runLoop() is important even on Android.
Otherwise we get crashes in online Kit when attempting to shutdown reasonably cleanly and the poll kicks in. Change-Id: I9a1744b42fec9f8ffddc6094773bda943caedf2a Reviewed-on: https://gerrit.libreoffice.org/74056 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'desktop/source/lib/init.cxx')
-rw-r--r--desktop/source/lib/init.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 4ab1f67d7e68..8cfa28881d90 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4825,7 +4825,7 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/,
LibreOfficeKitWakeCallback pWakeCallback,
void* pData)
{
-#ifdef IOS // Maybe ANDROID, too?
+#if defined(IOS) || defined(ANDROID)
Application::GetSolarMutex().acquire();
#endif
@@ -4836,7 +4836,7 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/,
Application::UpdateMainThread();
soffice_main();
}
-#ifdef IOS // ANDROID, too?
+#if defined(IOS) || defined(ANDROID)
vcl::lok::unregisterPollCallbacks();
Application::ReleaseSolarMutex();
#endif