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>
This commit is contained in:
Jan Holesovsky
2019-06-17 07:00:20 +02:00
parent 6b888ac476
commit 0abdf307ea
+2 -2
View File
@@ -4692,7 +4692,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
@@ -4703,7 +4703,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