Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-04-19 02:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android: Fix crash when emitting signal with java.util.HashMap

Browse source
This commit is contained in:
Anish Kumar 2026-01-14 13:16:52 +05:30
parent 634220e9fc
commit 5387f0d596
3 changed files with 53 additions and 15 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") {
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") {
ret[i] = _jobject_to_variant(env, obj);
} else {
Ref<JavaObject> java_obj_wrapped = Ref<JavaObject>(memnew(JavaObject(java_class_wrapped, obj)));