From 0bb0b47e7ae175002dee4be7450f26d2d86b7446 Mon Sep 17 00:00:00 2001
From: OttoLidenbrock <unknown>
Date: Tue, 5 May 2015 18:26:41 +1000
Subject: [PATCH] Attempt to stop lollipop crash

---
 src/client/clientlauncher.cpp | 9 +++++++--
 src/porting_android.cpp       | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index feeb8e531..c68a485c7 100644
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -67,8 +67,11 @@ u32 getTime(TimePrecision prec) {
 
 ClientLauncher::~ClientLauncher()
 {
-	if (receiver)
+	if (receiver) {
+		if (device)
+			device->setEventReceiver(NULL);
 		delete receiver;
+	}
 
 	if (input)
 		delete input;
@@ -76,8 +79,10 @@ ClientLauncher::~ClientLauncher()
 	if (g_fontengine)
 		delete g_fontengine;
 
-	if (device)
+	if (device) {
+		device->closeDevice();
 		device->drop();
+	}
 }
 
 
diff --git a/src/porting_android.cpp b/src/porting_android.cpp
index 6871ce465..910f5a729 100644
--- a/src/porting_android.cpp
+++ b/src/porting_android.cpp
@@ -43,8 +43,8 @@ void android_main(android_app *app)
 
 	try {
 		app_dummy();
-		char *argv[] = { (char*) "minetest" };
-		main(sizeof(argv) / sizeof(argv[0]), argv);
+		char argv[] = PROJECT_NAME;
+		retval = main(1, (char **)&argv);
 		}
 	catch(BaseException e) {
 		std::stringstream msg;
@@ -63,7 +63,7 @@ void android_main(android_app *app)
 
 	porting::cleanupAndroid();
 	errorstream << "Shutting down minetest." << std::endl;
-	exit(retval);
+	exit(0);
 }
 
 /* handler for finished message box input */