diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-12 21:00:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-12 21:00:19 +0100 |
commit | 8080e5c4f3685b062190be3e1b54a18f0e2229a7 (patch) | |
tree | e345721e63df44d4e6593b8b2df03c43dee22434 /modules/mono/signal_awaiter_utils.cpp | |
parent | cf8c679a23b21d6c6f29cba6a54eaa2eed88bf92 (diff) | |
parent | 09534e29222fd5e4f1bf7ce7cc910fd589e35d00 (diff) |
Merge pull request #36157 from akien-mga/fix-build-mono-gdnative
Fix Mono and GDNative builds after changes to ObjectID
Diffstat (limited to 'modules/mono/signal_awaiter_utils.cpp')
-rw-r--r-- | modules/mono/signal_awaiter_utils.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/modules/mono/signal_awaiter_utils.cpp b/modules/mono/signal_awaiter_utils.cpp index d3226762ea..b85d5f2fd9 100644 --- a/modules/mono/signal_awaiter_utils.cpp +++ b/modules/mono/signal_awaiter_utils.cpp @@ -68,7 +68,7 @@ Error connect_signal_awaiter(Object *p_source, const String &p_signal, Object *p Variant SignalAwaiterHandle::_signal_callback(const Variant **p_args, int p_argcount, Variant::CallError &r_error) { #ifdef DEBUG_ENABLED - ERR_FAIL_COND_V_MSG(conn_target_id && !ObjectDB::get_instance(conn_target_id), Variant(), + ERR_FAIL_COND_V_MSG(conn_target_id.is_valid() && !ObjectDB::get_instance(conn_target_id), Variant(), "Resumed after await, but class instance is gone."); #endif @@ -116,12 +116,7 @@ void SignalAwaiterHandle::_bind_methods() { } SignalAwaiterHandle::SignalAwaiterHandle(MonoObject *p_managed) : - MonoGCHandle(MonoGCHandle::new_strong_handle(p_managed), STRONG_HANDLE) { - -#ifdef DEBUG_ENABLED - conn_target_id = 0; -#endif -} + MonoGCHandle(MonoGCHandle::new_strong_handle(p_managed), STRONG_HANDLE) {} SignalAwaiterHandle::~SignalAwaiterHandle() { |