diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2015-12-30 09:35:44 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2015-12-30 09:35:44 +0100 |
| commit | ac13c8c0c6fc346462b21ee00139dddd2e4ec1e3 (patch) | |
| tree | 89274e9fcb77a39091cf6d7a117953ea958a7966 /modules/gdscript/gd_compiler.cpp | |
| parent | b8f18cd73c13a1e19973252c8b403f8c375e400e (diff) | |
| parent | 61a1f596cc19fd47ff1c8d1f5f5d7c4af300bc8f (diff) | |
| download | redot-engine-ac13c8c0c6fc346462b21ee00139dddd2e4ec1e3.tar.gz | |
Merge pull request #3170 from leezh/subclass_segfault_fix
added missing onready allocation for subclasses
Diffstat (limited to 'modules/gdscript/gd_compiler.cpp')
| -rw-r--r-- | modules/gdscript/gd_compiler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gd_compiler.cpp b/modules/gdscript/gd_compiler.cpp index add6235f32..7b07010529 100644 --- a/modules/gdscript/gd_compiler.cpp +++ b/modules/gdscript/gd_compiler.cpp @@ -1218,7 +1218,7 @@ Error GDCompiler::_parse_function(GDScript *p_script,const GDParser::ClassNode * bool is_initializer=!p_for_ready && !p_func; - if (is_initializer || String(p_func->name)=="_init") { + if (is_initializer || (p_func && String(p_func->name)=="_init")) { //parse initializer for class members if (!p_func && p_class->extends_used && p_script->native.is_null()){ |