Merge pull request #85454 from m4gr3d/fix_android_freeze_on_close

Fix issue causing Godot Android apps / games to freeze on close
2023-11-28 08:22:14 +01:00 · 2023-11-28 08:22:14 +01:00 · d6dd1de644
commit d6dd1de644
parent eda44bfe10 1e4af5269f
1 changed files with 5 additions and 2 deletions
--- a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt
+++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt
@ -536,8 +536,11 @@ class Godot(private val context: Context) : SensorEventListener {
 		for (plugin in pluginRegistry.allPlugins) {
 			plugin.onMainDestroy()
 		}
-		GodotLib.ondestroy()
-		forceQuit()
+
+		runOnRenderThread {
+			GodotLib.ondestroy()
+			forceQuit()
+		}
 	}

 	/**