diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-05 15:43:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-05 15:43:01 +0100 |
| commit | 7ada59efb79f64882305c26c3a155385e5dcc05c (patch) | |
| tree | 55db440c5a85ee333fd18236b3fe897a19fed554 /core/object.cpp | |
| parent | 9591ca3fe58298ef01ab12f1e59e91399a7ce2d4 (diff) | |
| parent | 677604685dd2292f44fedb1b9a5b08b22137219a (diff) | |
Merge pull request #33391 from madmiraal/cleanup-error_macros
Clean up error_macros.h
Diffstat (limited to 'core/object.cpp')
| -rw-r--r-- | core/object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/object.cpp b/core/object.cpp index 21a3b2cc6c..937b1ae8d4 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -1225,7 +1225,7 @@ Error Object::emit_signal(const StringName &p_name, const Variant **p_args, int if (ce.error == Variant::CallError::CALL_ERROR_INVALID_METHOD && !ClassDB::class_exists(target->get_class_name())) { //most likely object is not initialized yet, do not throw error. } else { - ERR_PRINTS("Error calling method from signal '" + String(p_name) + "': " + Variant::get_call_error_text(target, c.method, args, argc, ce) + "."); + ERR_PRINT("Error calling method from signal '" + String(p_name) + "': " + Variant::get_call_error_text(target, c.method, args, argc, ce) + "."); err = ERR_METHOD_NOT_FOUND; } } @@ -1945,7 +1945,7 @@ Object::~Object() { if (_emitting) { //@todo this may need to actually reach the debugger prioritarily somehow because it may crash before - ERR_PRINTS("Object " + to_string() + " was freed or unreferenced while a signal is being emitted from it. Try connecting to the signal using 'CONNECT_DEFERRED' flag, or use queue_free() to free the object (if this object is a Node) to avoid this error and potential crashes."); + ERR_PRINT("Object " + to_string() + " was freed or unreferenced while a signal is being emitted from it. Try connecting to the signal using 'CONNECT_DEFERRED' flag, or use queue_free() to free the object (if this object is a Node) to avoid this error and potential crashes."); } while ((S = signal_map.next(NULL))) { |