godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #106674 from mihe/output-order-fix 

Fix print/error ordering issue in editor Output
This commit is contained in:
Thaddeus Crews 2025-05-22 12:15:00 -05:00
parent cdd3632902 2d39bfaa57
commit a9394898e7
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/editor_node.cpp
View File

@ -7014,7 +7014,11 @@ static Node *_resource_get_edited_scene() {
}
void EditorNode::_print_handler(void *p_this, const String &p_string, bool p_error, bool p_rich) {
callable_mp_static(&EditorNode::_print_handler_impl).call_deferred(p_string, p_error, p_rich);
if (!Thread::is_main_thread()) {
callable_mp_static(&EditorNode::_print_handler_impl).call_deferred(p_string, p_error, p_rich);
} else {
_print_handler_impl(p_string, p_error, p_rich);
}
}
void EditorNode::_print_handler_impl(const String &p_string, bool p_error, bool p_rich) {