summaryrefslogtreecommitdiffstats
path: root/platform/android/java_godot_lib_jni.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-05-20 17:07:05 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-05-20 17:07:05 +0200
commiteef7e2952741fb49177b5b93b2dd42fc0794206f (patch)
tree4db27961d82694507db60a6a7903f2e462d9b924 /platform/android/java_godot_lib_jni.cpp
parentb44e9b0ce4c5affb6e62451d39fe2449c085cea0 (diff)
parent5a74e5812b3de4bd979f40f04e14e50a2bdaa386 (diff)
downloadredot-engine-eef7e2952741fb49177b5b93b2dd42fc0794206f.tar.gz
Merge pull request #92143 from m4gr3d/cleanup_android_plugin_on_exit
Add logic to unregister the Godot plugins on engine termination
Diffstat (limited to 'platform/android/java_godot_lib_jni.cpp')
-rw-r--r--platform/android/java_godot_lib_jni.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp
index 6cab7e74fd..93743c4e35 100644
--- a/platform/android/java_godot_lib_jni.cpp
+++ b/platform/android/java_godot_lib_jni.cpp
@@ -42,6 +42,7 @@
#include "jni_utils.h"
#include "net_socket_android.h"
#include "os_android.h"
+#include "plugin/godot_plugin_jni.h"
#include "string_android.h"
#include "thread_jandroid.h"
#include "tts_android.h"
@@ -78,6 +79,9 @@ static void _terminate(JNIEnv *env, bool p_restart = false) {
step.set(-1); // Ensure no further steps are attempted and no further events are sent
// lets cleanup
+ // Unregister android plugins
+ unregister_plugins_singletons();
+
if (java_class_wrapper) {
memdelete(java_class_wrapper);
}