aboutsummaryrefslogtreecommitdiff
path: root/modules/nativescript/godot_nativescript.cpp
diff options
context:
space:
mode:
authorThomas Herzog2017-07-24 17:25:57 +0200
committerGitHub2017-07-24 17:25:57 +0200
commit008b20bd8f19ca109f707ad1e566c86c2eccfb45 (patch)
tree8100c2329bbd797d2b3a4756083f32b5d3b7302f /modules/nativescript/godot_nativescript.cpp
parentd0f1940534de29cd49a79be8ef6054b8dad13d29 (diff)
parent41eb8a0279538b368c6d19436eb5ff1232ece8aa (diff)
downloadgodot-008b20bd8f19ca109f707ad1e566c86c2eccfb45.tar.gz
godot-008b20bd8f19ca109f707ad1e566c86c2eccfb45.tar.zst
godot-008b20bd8f19ca109f707ad1e566c86c2eccfb45.zip
Merge pull request #9814 from karroffel/nativescript-doublefree
[NativeScript] forgot to uncomment userdata return
Diffstat (limited to 'modules/nativescript/godot_nativescript.cpp')
-rw-r--r--modules/nativescript/godot_nativescript.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/nativescript/godot_nativescript.cpp b/modules/nativescript/godot_nativescript.cpp
index 7da6d14d1..453cee3a1 100644
--- a/modules/nativescript/godot_nativescript.cpp
+++ b/modules/nativescript/godot_nativescript.cpp
@@ -195,7 +195,7 @@ void GDAPI *godot_nativescript_get_userdata(godot_object *p_instance) {
if (!instance)
return NULL;
if (instance->get_script_instance() && instance->get_script_instance()->get_language() == NativeScriptLanguage::get_singleton()) {
- // return ((NativeScriptInstance *)instance->get_script_instance())->get_userdata();
+ return ((NativeScriptInstance *)instance->get_script_instance())->userdata;
}
return NULL;
}