[Scummvm-git-logs] scummvm master -> b4b9ad1743dcf97999b7fda4860aa964d119118c

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b4b9ad1743 ANDROID: Remove duplicate _system->quit() from JNI::Destroy()


Commit: b4b9ad1743dcf97999b7fda4860aa964d119118c
    https://github.com/scummvm/scummvm/commit/b4b9ad1743dcf97999b7fda4860aa964d119118c
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-09-23T20:51:44+03:00

Commit Message:
ANDROID: Remove duplicate _system->quit() from JNI::Destroy()

Since it is already called in Jni::main after scummvm_main() returns. The second call in destroy caused crashes on some devices.

Changed paths:
    backends/platform/android/jni.cpp


diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp
index db91fc7..5e4c116 100644
--- a/backends/platform/android/jni.cpp
+++ b/backends/platform/android/jni.cpp
@@ -562,7 +562,6 @@ void JNI::destroy(JNIEnv *env, jobject self) {
 	delete _asset_archive;
 	_asset_archive = 0;
 
-	_system->quit();
 	delete _system;
 	g_system = 0;
 	_system = 0;