X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fandroid%2Fmainthread.cpp;h=d394f838bcd497495255dc14296313f546a7813f;hp=473379bd71ce373c4e8e8829d4a00ece43ff3c57;hb=264195348a606f22f9d50348cd03b93b49175acc;hpb=fa82e97ed56597f2d968abdf4ebf688de4f9b618

diff --git a/source/core/android/mainthread.cpp b/source/core/android/mainthread.cpp
index 473379b..d394f83 100644
--- a/source/core/android/mainthread.cpp
+++ b/source/core/android/mainthread.cpp
@@ -1,4 +1,5 @@
 #include <cstring>
+#include <cstdlib>
 #include <msp/fs/dir.h>
 #include <msp/fs/path.h>
 #include <msp/fs/utils.h>
@@ -58,7 +59,12 @@ void MainThread::main()
 	Msp::Application::run(1, argv, this, &app_created);
 	free(appname);
 	if(activity)
+	{
+		activity->callbacks->onDestroy = &end_process;
 		ANativeActivity_finish(activity);
+	}
+	else
+		end_process(0);
 }
 
 void MainThread::app_created(void *data)
@@ -96,5 +102,10 @@ void MainThread::input_queue_destroyed(ANativeActivity *activity, AInputQueue *q
 	reinterpret_cast<MainThread *>(activity->instance)->signal_input_queue_destroyed.emit(queue);
 }
 
+void MainThread::end_process(ANativeActivity *)
+{
+	exit(0);
+}
+
 } // namespace Android
 } // namespace Msp