[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - desktop/source

[Tor Lillqvist]

 desktop/source/lib/lokandroid.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 74a6f3ca1f4889405ab098c684f88b4cd30c5c06
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 16 13:01:35 2014 +0300

    android: Stopgap: _exit() is better than a hang
    
    Change-Id: Iaada020e85a8d2557e270f7d1514f2260ffb2af0

diff --git a/desktop/source/lib/lokandroid.cxx b/desktop/source/lib/lokandroid.cxx
index 6a0ba2a..15c41c4 100644
--- a/desktop/source/lib/lokandroid.cxx
+++ b/desktop/source/lib/lokandroid.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <unistd.h>
 #include <jni.h>
 
 #include <sal/types.h>
@@ -68,6 +69,9 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Office_destroy(J
 {
     LibreOfficeKit* pLibreOfficeKit = getHandle<LibreOfficeKit>(pEnv, aObject);
     pLibreOfficeKit->pClass->destroy(pLibreOfficeKit);
+    // Stopgap fix: _exit() to force the OS to restart the LO activity.
+    // Better than to hang.
+    _exit(0);
 }
 
 extern "C" SAL_JNI_EXPORT jlong JNICALL Java_org_libreoffice_kit_Office_documentLoadNative(JNIEnv* pEnv, jobject aObject, jstring documentPath)