diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-21 09:07:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-21 09:07:27 +0200 |
| commit | a1e6eeef3ec3b980c938b77a942491ee2e890c55 (patch) | |
| tree | 8fecd746eb6f827c6c442341159078b90bac0bf4 | |
| parent | 7b37321ae3996b8660f18ae8b2b630e9c1940621 (diff) | |
| parent | f35b1f3b9159a6c1197c24d8195000468d1c1c61 (diff) | |
Merge pull request #31521 from m4gr3d/force_quit_on_destroy
Shut down Godot processes on app exit.
| -rw-r--r-- | misc/ide/jetbrains/build.gradle | 2 | ||||
| -rw-r--r-- | platform/android/java/src/org/godotengine/godot/Godot.java | 4 |
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 |