Fix leakage of JNI object references

Fixes https://github.com/godotengine/godot/issues/87548
2024-04-15 10:30:18 -07:00
parent b8fa48be04
commit f291a4ed3a
20 changed files with 139 additions and 32 deletions
--- a/platform/android/api/jni_singleton.h
+++ b/platform/android/api/jni_singleton.h
@ -239,6 +239,17 @@ public:
 	JNISingleton() {
 #ifdef ANDROID_ENABLED
 		instance = nullptr;
+#endif
+	}
+
+	~JNISingleton() {
+#ifdef ANDROID_ENABLED
+		if (instance) {
+			JNIEnv *env = get_jni_env();
+			ERR_FAIL_NULL(env);
+
+			env->DeleteGlobalRef(instance);
+		}
 #endif
 	}
 };