[Scummvm-git-logs] scummvm master -> d39eca7e39f322b378845aba9ce7c09bc477987d
antoniou79
antoniou at cti.gr
Mon Sep 23 15:03:13 CEST 2019
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:
d39eca7e39 ANDROID: Fix crash when exiting a game (Blade Runner)
Commit: d39eca7e39f322b378845aba9ce7c09bc477987d
https://github.com/scummvm/scummvm/commit/d39eca7e39f322b378845aba9ce7c09bc477987d
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-09-23T16:02:30+03:00
Commit Message:
ANDROID: Fix crash when exiting a game (Blade Runner)
Changed paths:
backends/platform/android/android.cpp
backends/platform/android/jni.cpp
backends/platform/android/org/scummvm/scummvm/ScummVM.java
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index a5dedb0..5614d0a 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -126,6 +126,11 @@ OSystem_Android::~OSystem_Android() {
_timerManager = 0;
deleteMutex(_event_queue_lock);
+
+ delete _savefileManager;
+ _savefileManager = 0;
+
+ ModularBackend::quit();
}
void *OSystem_Android::timerThreadFunc(void *arg) {
diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp
index 5e4c116..db91fc7 100644
--- a/backends/platform/android/jni.cpp
+++ b/backends/platform/android/jni.cpp
@@ -562,6 +562,7 @@ void JNI::destroy(JNIEnv *env, jobject self) {
delete _asset_archive;
_asset_archive = 0;
+ _system->quit();
delete _system;
g_system = 0;
_system = 0;
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVM.java b/backends/platform/android/org/scummvm/scummvm/ScummVM.java
index 2784623..8dd974b 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVM.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVM.java
@@ -141,11 +141,10 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
int res = main(_args);
- destroy();
-
deinitEGL();
deinitAudio();
+ destroy();
// On exit, tear everything down for a fresh restart next time.
System.exit(res);
}
More information about the Scummvm-git-logs
mailing list