diff options
| author | Ignacio Roldán Etcheverry <neikeq@users.noreply.github.com> | 2022-10-02 19:23:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 19:23:44 +0200 |
| commit | abf473e2d022accdd5b7aa21d3e0b934b6ec0523 (patch) | |
| tree | 72d3dcc6075b0980bf67c76ae6b5c40b230092dc /modules/mono/managed_callable.cpp | |
| parent | e69b7083d45c5d8698508cce7086d361c4b1f44c (diff) | |
| parent | 161f295f52d21dea940d7c06e5f83a14beefb4c9 (diff) | |
Merge pull request #66674 from pkdawson/fix-callable-delegate
Fix C# delegate signal not disconnected when Object is destroyed
Diffstat (limited to 'modules/mono/managed_callable.cpp')
| -rw-r--r-- | modules/mono/managed_callable.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/mono/managed_callable.cpp b/modules/mono/managed_callable.cpp index 9305dc645a..0c2c533090 100644 --- a/modules/mono/managed_callable.cpp +++ b/modules/mono/managed_callable.cpp @@ -79,7 +79,9 @@ CallableCustom::CompareLessFunc ManagedCallable::get_compare_less_func() const { } ObjectID ManagedCallable::get_object() const { - // TODO: If the delegate target extends Godot.Object, use that instead! + if (object_id != ObjectID()) { + return object_id; + } return CSharpLanguage::get_singleton()->get_managed_callable_middleman()->get_instance_id(); } @@ -104,7 +106,7 @@ void ManagedCallable::release_delegate_handle() { // Why you do this clang-format... /* clang-format off */ -ManagedCallable::ManagedCallable(GCHandleIntPtr p_delegate_handle) : delegate_handle(p_delegate_handle) { +ManagedCallable::ManagedCallable(GCHandleIntPtr p_delegate_handle, ObjectID p_object_id) : delegate_handle(p_delegate_handle), object_id(p_object_id) { #ifdef GD_MONO_HOT_RELOAD { MutexLock lock(instances_mutex); |