summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-10-16 13:01:35 +0300
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-12-04 23:04:22 +0100
commit83268481d1ba5a69586cddc06b82f86e3b9dfdd2 (patch)
treeed1584ef9f05975ffd3e45cc38c15fe02447862c /desktop
parent2dd9b744c87f7c4a19a5742423e2aff1bb197cf4 (diff)
android: Stopgap: _exit() is better than a hang
Change-Id: Iaada020e85a8d2557e270f7d1514f2260ffb2af0
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/lokandroid.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/desktop/source/lib/lokandroid.cxx b/desktop/source/lib/lokandroid.cxx
index 6a0ba2a41648..15c41c444cb1 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)