2
0
Эх сурвалжийг харах

C#: Destroy script before clearing owner

The C# script destructor needs to access the owner (i.e.: to disconnect signals) so we now clear it after the script has been destroyed.
Raul Santos 1 жил өмнө
parent
commit
5e7fda8de7

+ 1 - 1
modules/mono/csharp_script.cpp

@@ -2351,8 +2351,8 @@ CSharpInstance *CSharpScript::_create_instance(const Variant **p_args, int p_arg
 	if (!ok) {
 	if (!ok) {
 		// Important to clear this before destroying the script instance here
 		// Important to clear this before destroying the script instance here
 		instance->script = Ref<CSharpScript>();
 		instance->script = Ref<CSharpScript>();
-		instance->owner = nullptr;
 		p_owner->set_script_instance(nullptr);
 		p_owner->set_script_instance(nullptr);
+		instance->owner = nullptr;
 
 
 		return nullptr;
 		return nullptr;
 	}
 	}