Merge pull request #9757 from RameshRavone/patch-1

gdnative bug fix in get (return null check)

1 files changed, 5 insertions, 2 deletions

diff --git a/modules/gdnative/gdnative.cpp b/modules/gdnative/gdnative.cpp
index 93e13850ac..214164ef89 100644
--- a/modules/gdnative/gdnative.cpp
+++ b/modules/gdnative/gdnative.cpp
@@ -876,9 +876,12 @@ bool GDNativeInstance::get(const StringName &p_name, Variant &r_ret) const {
 		const Variant *args[1] = { &name };
 
 		godot_variant result = E->get().method.method((godot_object *)owner, E->get().method.method_data, userdata, 1, (godot_variant **)args);
-		r_ret = *(Variant *)&result;
+		if (((Variant *)&result)->get_type() != Variant::NIL) {
+			r_ret = *(Variant *)&result;
+			godot_variant_destroy(&result);
+			return true;
+		}
 		godot_variant_destroy(&result);
-		return true;
 	}
 
 	return false;