asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #77080 from KoBeWi/spam_error_log_with_multiple_threads_for_better_spam_efficiency

Browse source 
Allow showing messages from threads in Editor Log
This commit is contained in:
Rémi Verschelde 2023-05-16 11:01:32 +02:00
commit 965db42911
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
editor/editor_log.cpp
View file

@ -43,9 +43,6 @@
void EditorLog::_error_handler(void *p_self, const char *p_func, const char *p_file, int p_line, const char *p_error, const char *p_errorexp, bool p_editor_notify, ErrorHandlerType p_type) { void EditorLog::_error_handler(void *p_self, const char *p_func, const char *p_file, int p_line, const char *p_error, const char *p_errorexp, bool p_editor_notify, ErrorHandlerType p_type) {
EditorLog *self = static_cast<EditorLog *>(p_self); EditorLog *self = static_cast<EditorLog *>(p_self);
if (self->current != Thread::get_caller_id()) {
return;
}
String err_str; String err_str;
if (p_errorexp && p_errorexp[0]) { if (p_errorexp && p_errorexp[0]) {
@ -58,10 +55,12 @@ void EditorLog::_error_handler(void *p_self, const char *p_func, const char *p_f
err_str += " (User)"; err_str += " (User)";
} }
if (p_type == ERR_HANDLER_WARNING) { MessageType message_type = p_type == ERR_HANDLER_WARNING ? MSG_TYPE_WARNING : MSG_TYPE_ERROR;
self->add_message(err_str, MSG_TYPE_WARNING);
if (self->current != Thread::get_caller_id()) {
callable_mp(self, &EditorLog::add_message).bind(err_str, message_type).call_deferred();
} else { } else {
self->add_message(err_str, MSG_TYPE_ERROR); self->add_message(err_str, message_type);
} }
} }