瀏覽代碼

Merge pull request #2937 from koalefant/master

fixed crash when creating new object with wrong number of arguments (rebased)
Rémi Verschelde 9 年之前
父節點
當前提交
280d72eb8b
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      core/object.cpp

+ 4 - 1
core/object.cpp

@@ -970,7 +970,10 @@ void Object::set_script_instance(ScriptInstance *p_instance) {
 
 	script_instance=p_instance;
 
-	script=p_instance->get_script().get_ref_ptr();
+	if (p_instance)
+		script=p_instance->get_script().get_ref_ptr();
+	else
+		script=RefPtr();
 }
 
 RefPtr Object::get_script() const {