|
@@ -1686,7 +1686,9 @@ Callable managed_to_callable(const M_Callable &p_managed_callable) {
|
|
Object *target = p_managed_callable.target ?
|
|
Object *target = p_managed_callable.target ?
|
|
unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(p_managed_callable.target)) :
|
|
unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(p_managed_callable.target)) :
|
|
nullptr;
|
|
nullptr;
|
|
- StringName *method_ptr = unbox<StringName *>(CACHED_FIELD(StringName, ptr)->get_value(p_managed_callable.method_string_name));
|
|
|
|
|
|
+ StringName *method_ptr = p_managed_callable.method_string_name ?
|
|
|
|
+ unbox<StringName *>(CACHED_FIELD(StringName, ptr)->get_value(p_managed_callable.method_string_name)) :
|
|
|
|
+ nullptr;
|
|
StringName method = method_ptr ? *method_ptr : StringName();
|
|
StringName method = method_ptr ? *method_ptr : StringName();
|
|
return Callable(target, method);
|
|
return Callable(target, method);
|
|
}
|
|
}
|
|
@@ -1732,7 +1734,9 @@ Signal managed_to_signal_info(const M_SignalInfo &p_managed_signal) {
|
|
Object *owner = p_managed_signal.owner ?
|
|
Object *owner = p_managed_signal.owner ?
|
|
unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(p_managed_signal.owner)) :
|
|
unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(p_managed_signal.owner)) :
|
|
nullptr;
|
|
nullptr;
|
|
- StringName *name_ptr = unbox<StringName *>(CACHED_FIELD(StringName, ptr)->get_value(p_managed_signal.name_string_name));
|
|
|
|
|
|
+ StringName *name_ptr = p_managed_signal.name_string_name ?
|
|
|
|
+ unbox<StringName *>(CACHED_FIELD(StringName, ptr)->get_value(p_managed_signal.name_string_name)) :
|
|
|
|
+ nullptr;
|
|
StringName name = name_ptr ? *name_ptr : StringName();
|
|
StringName name = name_ptr ? *name_ptr : StringName();
|
|
return Signal(owner, name);
|
|
return Signal(owner, name);
|
|
}
|
|
}
|