diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2023-11-28 09:14:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-28 09:14:11 +0100 |
| commit | f82bf35a03502b33e0b3a5987573e3c6987912ce (patch) | |
| tree | 65e25db78d958d6dccf20da80ea8b46f2b120bf4 | |
| parent | a008a85443cf95f8188fa68471c78d5597b3df68 (diff) | |
| parent | 7cd604132b479e4cfcfaeac0a482f9a593922385 (diff) | |
| download | redot-engine-f82bf35a03502b33e0b3a5987573e3c6987912ce.tar.gz | |
Merge pull request #85457 from m4gr3d/fix_android_editor_restart_loop
Fix an issue causing the running project window to loop-restart when closed
| -rw-r--r-- | platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt index 02709d4dc5..0d7017ae71 100644 --- a/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt +++ b/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt @@ -221,16 +221,9 @@ open class GodotEditor : GodotActivity() { val runningProcesses = activityManager.runningAppProcesses for (runningProcess in runningProcesses) { if (runningProcess.processName.endsWith(processNameSuffix)) { - if (targetClass == null) { - // Killing process directly - Log.v(TAG, "Killing Godot process ${runningProcess.processName}") - Process.killProcess(runningProcess.pid) - } else { - // Activity is running; sending a request for self termination. - Log.v(TAG, "Sending force quit request to $targetClass running on process ${runningProcess.processName}") - val forceQuitIntent = Intent(this, targetClass).putExtra(EXTRA_FORCE_QUIT, true) - startActivity(forceQuitIntent) - } + // Killing process directly + Log.v(TAG, "Killing Godot process ${runningProcess.processName}") + Process.killProcess(runningProcess.pid) return true } } |