From 4ccdbde845437215dbb069b42231b4aebf06e327 Mon Sep 17 00:00:00 2001 From: sanikoyes Date: Thu, 18 Dec 2014 12:50:47 +0800 Subject: Fix crash when gd-script _init fail --- modules/gdscript/gd_script.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/gdscript/gd_script.cpp') diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 982584c75c..97d97f1ef4 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -1440,8 +1440,8 @@ GDInstance* GDScript::_create_instance(const Variant** p_args,int p_argcount,Obj if (err.error!=Variant::CallError::CALL_OK) { instance->script=Ref(); + instance->owner->set_script_instance(NULL); instances.erase(p_owner); - memdelete(instance); ERR_FAIL_COND_V(err.error!=Variant::CallError::CALL_OK, NULL); //error consrtucting } -- cgit v1.2.3 From a36a774897ae191ebb90ba803bac7f919e92bd6c Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 20 Dec 2014 15:30:06 -0300 Subject: Fixes -=-=-= -Added missing quaternion constructor -code completion fixes -winrt fixes --- modules/gdscript/gd_script.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/gdscript/gd_script.cpp') diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 97d97f1ef4..3f7a6b000f 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -1756,6 +1756,7 @@ bool GDScript::_update_exports() { return changed; #endif + return false; } void GDScript::update_exports() { -- cgit v1.2.3