diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-08-30 08:44:36 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-08-30 08:44:36 +0200 |
commit | 8edc0b43b94bcc04defeeebd7ce120a0131ff511 (patch) | |
tree | bfa167f5598efc3f8c0a05b131be6bb8812b7edd /modules/mono/csharp_script.cpp | |
parent | d2f76e87869b892d7992696e0b381c5afebe3d0d (diff) | |
parent | c4705a590b5eb01d63afb907d6dad5c49d8f6fe1 (diff) | |
download | redot-engine-8edc0b43b94bcc04defeeebd7ce120a0131ff511.tar.gz |
Merge pull request #78634 from Sauermann/fix-notification-order
Fix `Object::notification` order
Diffstat (limited to 'modules/mono/csharp_script.cpp')
-rw-r--r-- | modules/mono/csharp_script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 1fcb2791d9..692eb2dc6a 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -1978,7 +1978,7 @@ const Variant CSharpInstance::get_rpc_config() const { return script->get_rpc_config(); } -void CSharpInstance::notification(int p_notification) { +void CSharpInstance::notification(int p_notification, bool p_reversed) { if (p_notification == Object::NOTIFICATION_PREDELETE) { // When NOTIFICATION_PREDELETE is sent, we also take the chance to call Dispose(). // It's safe to call Dispose() multiple times and NOTIFICATION_PREDELETE is guaranteed @@ -1996,7 +1996,7 @@ void CSharpInstance::notification(int p_notification) { return; } - _call_notification(p_notification); + _call_notification(p_notification, p_reversed); GDMonoCache::managed_callbacks.CSharpInstanceBridge_CallDispose( gchandle.get_intptr(), /* okIfNull */ false); @@ -2004,10 +2004,10 @@ void CSharpInstance::notification(int p_notification) { return; } - _call_notification(p_notification); + _call_notification(p_notification, p_reversed); } -void CSharpInstance::_call_notification(int p_notification) { +void CSharpInstance::_call_notification(int p_notification, bool p_reversed) { Variant arg = p_notification; const Variant *args[1] = { &arg }; StringName method_name = SNAME("_notification"); |