Merge pull request #94079 from RandomShaper/editor_main_mq

Let EditorLog use the right call queue for thread safety
godotengine · Jul 8, 2024 · 16f98cd · 16f98cd
2 parents 6deaa15 + 20298fb
commit 16f98cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp
@@ -58,8 +58,8 @@ void EditorLog::_error_handler(void *p_self, const char *p_func, const char *p_f
 
 	MessageType message_type = p_type == ERR_HANDLER_WARNING ? MSG_TYPE_WARNING : MSG_TYPE_ERROR;
 
-	if (self->current != Thread::get_caller_id()) {
-		callable_mp(self, &EditorLog::add_message).call_deferred(err_str, message_type);
+	if (!Thread::is_main_thread()) {
+		MessageQueue::get_main_singleton()->push_callable(callable_mp(self, &EditorLog::add_message), err_str, message_type);
 	} else {
 		self->add_message(err_str, message_type);
 	}
@@ -557,8 +557,6 @@ EditorLog::EditorLog() {
 	eh.errfunc = _error_handler;
 	eh.userdata = this;
 	add_error_handler(&eh);
-
-	current = Thread::get_caller_id();
 }
 
 void EditorLog::deinit() {

diff --git a/editor/editor_log.h b/editor/editor_log.h
@@ -156,8 +156,6 @@ class EditorLog : public HBoxContainer {
 
 	ErrorHandlerList eh;
 
-	Thread::ID current;
-
 	//void _dragged(const Point2& p_ofs);
 	void _meta_clicked(const String &p_meta);
 	void _clear_request();