Skip to content

Commit 598409b

Browse files
committed
Merge pull request godotengine#108947 from mihe/gdscript-reload-crash
Fix crash when GDScript scripts are reloaded during initial import
2 parents 6c51d93 + 809a6cf commit 598409b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

modules/gdscript/gdscript.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,9 @@ GDScriptInstance *GDScript::_create_instance(const Variant **p_args, int p_argco
187187
return instance;
188188
}
189189

190-
initializer = _super_constructor(this);
191-
if (initializer != nullptr) {
192-
initializer->call(instance, p_args, p_argcount, r_error);
190+
GDScriptFunction *applicable_initializer = _super_constructor(this);
191+
if (applicable_initializer != nullptr) {
192+
applicable_initializer->call(instance, p_args, p_argcount, r_error);
193193
if (r_error.error != Callable::CallError::CALL_OK) {
194194
String error_text = Variant::get_call_error_text(instance->owner, "_init", p_args, p_argcount, r_error);
195195
instance->script = Ref<GDScript>();

0 commit comments

Comments
 (0)