godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39081 from m4gr3d/fix_emit_signal_3_2 

[3.2] Fix parameters passing when emitting signal
This commit is contained in:
Rémi Verschelde 2020-05-27 12:53:35 +02:00 committed by GitHub
parent 6abe73f5b8 3c0b26e29c
commit 9aeb9ea826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/android/plugin/godot_plugin_jni.cpp
View File

@ -119,13 +119,15 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeEmitS
String signal_name = jstring_to_string(j_signal_name, env); String signal_name = jstring_to_string(j_signal_name, env);
int count = env->GetArrayLength(j_signal_params); int count = env->GetArrayLength(j_signal_params);
const Variant *args[count]; ERR_FAIL_COND_MSG(count > VARIANT_ARG_MAX, "Maximum argument count exceeded!");
Variant variant_params[VARIANT_ARG_MAX];
const Variant *args[VARIANT_ARG_MAX];
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
jobject j_param = env->GetObjectArrayElement(j_signal_params, i); jobject j_param = env->GetObjectArrayElement(j_signal_params, i);
Variant variant = _jobject_to_variant(env, j_param); variant_params[i] = _jobject_to_variant(env, j_param);
args[i] = &variant; args[i] = &variant_params[i];
env->DeleteLocalRef(j_param); env->DeleteLocalRef(j_param);
}; };