[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/source

[Jan Holesovsky (via logerrit)]

 desktop/source/lib/init.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 38f614746318913305fcce5a678d9cd26e52013c
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Jun 14 18:38:51 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Jun 17 07:00:33 2019 +0200

    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 at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

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