summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfhuya <fhuyakou@gmail.com>2019-08-20 22:35:46 -0700
committerfhuya <fhuyakou@gmail.com>2019-08-20 22:35:46 -0700
commitf35b1f3b9159a6c1197c24d8195000468d1c1c61 (patch)
treeee1e031fbffdcbd0e97a252d15e1b2f8db94e2a4
parent093798c976373a664a8e274ae31774e8dcf2238a (diff)
Shut down Godot processes on app exit.
-rw-r--r--misc/ide/jetbrains/build.gradle2
-rw-r--r--platform/android/java/src/org/godotengine/godot/Godot.java4
2 files changed, 5 insertions, 1 deletions
diff --git a/misc/ide/jetbrains/build.gradle b/misc/ide/jetbrains/build.gradle
index eb2fbc0e69..dea81b4ea3 100644
--- a/misc/ide/jetbrains/build.gradle
+++ b/misc/ide/jetbrains/build.gradle
@@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.3.2'
+ classpath 'com.android.tools.build:gradle:3.4.2'
}
}
diff --git a/platform/android/java/src/org/godotengine/godot/Godot.java b/platform/android/java/src/org/godotengine/godot/Godot.java
index 6e1841fa8b..bfc65a3b78 100644
--- a/platform/android/java/src/org/godotengine/godot/Godot.java
+++ b/platform/android/java/src/org/godotengine/godot/Godot.java
@@ -625,6 +625,10 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
GodotLib.ondestroy(this);
super.onDestroy();
+
+ // TODO: This is a temp solution. The proper fix will involve tracking down and properly shutting down each
+ // native Godot components that is started in Godot#onVideoInit.
+ forceQuit();
}
@Override