godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44109 from neikeq/fix-await-to-signal-many-at-once 

C#: Fix multiple awaits to same signal result in connect error
This commit is contained in:
Rémi Verschelde 2020-12-05 16:42:19 +01:00 committed by GitHub
parent 45ecb21901 e2f7037824
commit 83cdc9d7b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/mono/signal_awaiter_utils.cpp
View File

@ -48,18 +48,10 @@ Error gd_mono_connect_signal_awaiter(Object *p_source, const StringName &p_signa
} }
bool SignalAwaiterCallable::compare_equal(const CallableCustom *p_a, const CallableCustom *p_b) { bool SignalAwaiterCallable::compare_equal(const CallableCustom *p_a, const CallableCustom *p_b) {
// Only called if both instances are of type SignalAwaiterCallable. Static cast is safe.
const SignalAwaiterCallable *a = static_cast<const SignalAwaiterCallable *>(p_a); const SignalAwaiterCallable *a = static_cast<const SignalAwaiterCallable *>(p_a);
const SignalAwaiterCallable *b = static_cast<const SignalAwaiterCallable *>(p_b); const SignalAwaiterCallable *b = static_cast<const SignalAwaiterCallable *>(p_b);
return a->awaiter_handle.handle == b->awaiter_handle.handle;
if (a->target_id != b->target_id) {
return false;
}
if (a->signal != b->signal) {
return false;
}
return true;
} }
bool SignalAwaiterCallable::compare_less(const CallableCustom *p_a, const CallableCustom *p_b) { bool SignalAwaiterCallable::compare_less(const CallableCustom *p_a, const CallableCustom *p_b) {