Wuzzy/BlockColor-Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to stop lollipop crash

Browse Source
This commit is contained in:
OttoLidenbrock 2015-05-05 18:26:41 +10:00
parent f1d564e324
commit 0bb0b47e7a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/clientlauncher.cpp
View File

@ -67,8 +67,11 @@ u32 getTime(TimePrecision prec) {
ClientLauncher::~ClientLauncher() ClientLauncher::~ClientLauncher()
{ {
if (receiver) if (receiver) {
if (device)
device->setEventReceiver(NULL);
delete receiver; delete receiver;
}
if (input) if (input)
delete input; delete input;
@ -76,8 +79,10 @@ ClientLauncher::~ClientLauncher()
if (g_fontengine) if (g_fontengine)
delete g_fontengine; delete g_fontengine;
if (device) if (device) {
device->closeDevice();
device->drop(); device->drop();
}
} }

6
src/porting_android.cpp
View File

@ -43,8 +43,8 @@ void android_main(android_app *app)
try { try {
app_dummy(); app_dummy();
char *argv[] = { (char*) "minetest" }; char argv[] = PROJECT_NAME;
main(sizeof(argv) / sizeof(argv[0]), argv); retval = main(1, (char **)&argv);
} }
catch(BaseException e) { catch(BaseException e) {
std::stringstream msg; std::stringstream msg;
@ -63,7 +63,7 @@ void android_main(android_app *app)
porting::cleanupAndroid(); porting::cleanupAndroid();
errorstream << "Shutting down minetest." << std::endl; errorstream << "Shutting down minetest." << std::endl;
exit(retval); exit(0);
} }
/* handler for finished message box input */ /* handler for finished message box input */