diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-29 00:04:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 00:04:42 +0200 |
| commit | fd0716cba92f2189a18118bc67bd05f07d9c420d (patch) | |
| tree | e03379f330306b4dc2fd51bd537a45e20d573b09 /platform/android/java_godot_lib_jni.cpp | |
| parent | 5149db8d85ac491bafcb1b84203601b8c9593c7f (diff) | |
| parent | 5711037bf6455ac8e7dc317975b7b0591decbb53 (diff) | |
Merge pull request #58160 from m4gr3d/android_editor
Diffstat (limited to 'platform/android/java_godot_lib_jni.cpp')
| -rw-r--r-- | platform/android/java_godot_lib_jni.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp index 249717921f..658f9281ab 100644 --- a/platform/android/java_godot_lib_jni.cpp +++ b/platform/android/java_godot_lib_jni.cpp @@ -107,6 +107,9 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *en JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_ondestroy(JNIEnv *env, jclass clazz) { // lets cleanup + if (java_class_wrapper) { + memdelete(java_class_wrapper); + } if (godot_io_java) { delete godot_io_java; } @@ -117,6 +120,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_ondestroy(JNIEnv *env delete input_handler; } if (os_android) { + os_android->main_loop_end(); delete os_android; } } @@ -146,7 +150,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jc } } - Error err = Main::setup("apk", cmdlen, (char **)cmdline, false); + Error err = Main::setup(OS_Android::ANDROID_EXEC_PATH, cmdlen, (char **)cmdline, false); if (cmdline) { if (j_cmdline) { for (int i = 0; i < cmdlen; ++i) { |