Merge pull request #85454 from m4gr3d/fix_android_freeze_on_close

Fix issue causing Godot Android apps / games to freeze on close
godotengine · Nov 28, 2023 · d6dd1de · d6dd1de
2 parents eda44bf + 1e4af52
commit d6dd1de
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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()
+		}
 	}
 
 	/**