diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-06-14 18:38:51 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-10-09 10:39:17 +0200 |
| commit | 2943733ea4f4080a17a45b60690367d78bc79d5c (patch) | |
| tree | 354183555d0eceffabcd23b12c158bbd15a2f147 /desktop | |
| parent | a4fc6e8d529ab4f90218188bef3515d0f04b50f1 (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/74064
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/80274
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 463371414214..a648918b750c 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -5192,7 +5192,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 @@ -5203,7 +5203,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 |