Explorar el Código

Merge pull request #108947 from mihe/gdscript-reload-crash

Fix crash when GDScript scripts are reloaded during initial import
Thaddeus Crews hace 1 mes
padre
commit
598409b727
Se han modificado 1 ficheros con 3 adiciones y 3 borrados
  1. 3 3
      modules/gdscript/gdscript.cpp

+ 3 - 3
modules/gdscript/gdscript.cpp

@@ -187,9 +187,9 @@ GDScriptInstance *GDScript::_create_instance(const Variant **p_args, int p_argco
 		return instance;
 	}
 
-	initializer = _super_constructor(this);
-	if (initializer != nullptr) {
-		initializer->call(instance, p_args, p_argcount, r_error);
+	GDScriptFunction *applicable_initializer = _super_constructor(this);
+	if (applicable_initializer != nullptr) {
+		applicable_initializer->call(instance, p_args, p_argcount, r_error);
 		if (r_error.error != Callable::CallError::CALL_OK) {
 			String error_text = Variant::get_call_error_text(instance->owner, "_init", p_args, p_argcount, r_error);
 			instance->script = Ref<GDScript>();