hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #104156 from dsnopek/javaclasswrapper-dictionary-redux

Browse source 
JavaClassWrapper: Fix mistake in last fix for `org.godotengine.godot.Dictionary` conversion
This commit is contained in:
Thaddeus Crews 2025-03-15 19:42:41 -05:00
commit 70f3d9aff5
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platform/android/java_class_wrapper.cpp
View file

@ -1078,7 +1078,7 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
if (java_class_wrapped.is_valid()) {
String cn = java_class_wrapped->get_java_class_name();
if (cn == "org/godotengine/godot/Dictionary" || cn == "java.util.HashMap") {
if (cn == "org.godotengine.godot.Dictionary" || cn == "java.util.HashMap") {
var = _jobject_to_variant(env, obj);
} else {
Ref<JavaObject> ret = Ref<JavaObject>(memnew(JavaObject(java_class_wrapped, obj)));
@ -1442,7 +1442,7 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
if (java_class_wrapped.is_valid()) {
String cn = java_class_wrapped->get_java_class_name();
if (cn == "org/godotengine/godot/Dictionary" || cn == "java.util.HashMap") {
if (cn == "org.godotengine.godot.Dictionary" || cn == "java.util.HashMap") {
ret[i] = _jobject_to_variant(env, obj);
} else {
Ref<JavaObject> java_obj_wrapped = Ref<JavaObject>(memnew(JavaObject(java_class_wrapped, obj)));