diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-09 12:40:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 12:40:05 +0200 |
| commit | 3ea33c0e455f5e52b73ae5da51d0000e8decef7b (patch) | |
| tree | 674a28d2d3e4f83bd53d72e07d1ba8327c6f1c99 /modules/mono/signal_awaiter_utils.cpp | |
| parent | 80c7cb63783414daba5a5ef84085bbb3c6f1ff15 (diff) | |
| parent | c55ce204b3065d55df2717a7e0bcb0681392ac34 (diff) | |
Merge pull request #31221 from neikeq/err-explain-to-msg-mono
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in 'modules/mono'
Diffstat (limited to 'modules/mono/signal_awaiter_utils.cpp')
| -rw-r--r-- | modules/mono/signal_awaiter_utils.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/mono/signal_awaiter_utils.cpp b/modules/mono/signal_awaiter_utils.cpp index 54d73c971f..189ceaab1b 100644 --- a/modules/mono/signal_awaiter_utils.cpp +++ b/modules/mono/signal_awaiter_utils.cpp @@ -67,10 +67,8 @@ 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 - if (conn_target_id && !ObjectDB::get_instance(conn_target_id)) { - ERR_EXPLAIN("Resumed after await, but class instance is gone"); - ERR_FAIL_V(Variant()); - } + ERR_FAIL_COND_V_MSG(conn_target_id && !ObjectDB::get_instance(conn_target_id), Variant(), + "Resumed after await, but class instance is gone."); #endif if (p_argcount < 1) { |