asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #85457 from m4gr3d/fix_android_editor_restart_loop

Browse source 
Fix an issue causing the running project window to loop-restart when closed
This commit is contained in:
Rémi Verschelde 2023-11-28 09:14:11 +01:00 committed by GitHub
commit f82bf35a03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt
View file

@ -221,16 +221,9 @@ open class GodotEditor : GodotActivity() {
val runningProcesses = activityManager.runningAppProcesses val runningProcesses = activityManager.runningAppProcesses
for (runningProcess in runningProcesses) { for (runningProcess in runningProcesses) {
if (runningProcess.processName.endsWith(processNameSuffix)) { if (runningProcess.processName.endsWith(processNameSuffix)) {
if (targetClass == null) { // Killing process directly
// Killing process directly Log.v(TAG, "Killing Godot process ${runningProcess.processName}")
Log.v(TAG, "Killing Godot process ${runningProcess.processName}") Process.killProcess(runningProcess.pid)
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)
}
return true return true
} }
} }