mirror of https://github.com/godotengine/godot
Merge pull request #95676 from raulsntos/dotnet/clear-owner-order
C#: Destroy script before clearing owner
This commit is contained in:
commit
1ac1d03857
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue