diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-07-18 15:48:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-18 15:48:17 +0200 |
| commit | 8772a7faca8156a502b12dda36e46cdb6904814f (patch) | |
| tree | 87e5a6305557b032c72c24060e6093517f426f08 | |
| parent | 4bd0dab16b949e7389a5684a19a3af3816b82aa9 (diff) | |
| parent | 3d237fc7d7956bf805d005833dc1687971ee452a (diff) | |
| download | redot-cpp-8772a7faca8156a502b12dda36e46cdb6904814f.tar.gz | |
Merge pull request #686 from ondy-personal/patch-1
| -rw-r--r-- | include/godot_cpp/core/engine_ptrcall.hpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/godot_cpp/core/engine_ptrcall.hpp b/include/godot_cpp/core/engine_ptrcall.hpp index b984db4..88052bd 100644 --- a/include/godot_cpp/core/engine_ptrcall.hpp +++ b/include/godot_cpp/core/engine_ptrcall.hpp @@ -48,6 +48,9 @@ O *_call_native_mb_ret_obj(const GDNativeMethodBindPtr mb, void *instance, const GodotObject *ret = nullptr; std::array<const GDNativeTypePtr, sizeof...(Args)> mb_args = { { (const GDNativeTypePtr)args... } }; internal::gdn_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), &ret); + if (ret == nullptr) { + return nullptr; + } return reinterpret_cast<O *>(internal::gdn_interface->object_get_instance_binding(ret, internal::token, &O::___binding_callbacks)); } |