diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2015-11-28 18:15:47 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2015-11-28 18:15:47 +0100 |
| commit | 280d72eb8b716e3ff8075eaafd50fbc5d14e32d6 (patch) | |
| tree | 430473887ec7df73811ac9bf1e37346b42af72de /core | |
| parent | e4c872a260320398cdf7ae0e920d53e46d5746a5 (diff) | |
| parent | bc998c9195a63f1079884ac304620032f7d43367 (diff) | |
Merge pull request #2937 from koalefant/master
fixed crash when creating new object with wrong number of arguments (rebased)
Diffstat (limited to 'core')
| -rw-r--r-- | core/object.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/object.cpp b/core/object.cpp index 07ac430d7a..3a4c06e7e7 100644 --- a/core/object.cpp +++ b/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 { |