mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77251 from RandomShaper/fix_editor_mt

Browse Source 
Make certain editor callbacks thread-safe
This commit is contained in:
Rémi Verschelde 2023-05-22 13:49:11 +02:00
commit fb613fd430
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
editor/editor_node.cpp
View File

@ -5901,6 +5901,10 @@ void EditorNode::_add_dropped_files_recursive(const Vector<String> &p_files, Str
}
void EditorNode::_file_access_close_error_notify(const String &p_str) {
callable_mp_static(&EditorNode::_file_access_close_error_notify_impl).bind(p_str).call_deferred();
}
void EditorNode::_file_access_close_error_notify_impl(const String &p_str) {
add_io_error(vformat(TTR("Unable to write to file '%s', file in use, locked or lacking permissions."), p_str));
}
@ -6502,13 +6506,16 @@ static Node *_resource_get_edited_scene() {
}
void EditorNode::_print_handler(void *p_this, const String &p_string, bool p_error, bool p_rich) {
EditorNode *en = static_cast<EditorNode *>(p_this);
callable_mp_static(&EditorNode::_print_handler_impl).bind(p_string, p_error, p_rich).call_deferred();
}
void EditorNode::_print_handler_impl(const String &p_string, bool p_error, bool p_rich) {
if (p_error) {
en->log->add_message(p_string, EditorLog::MSG_TYPE_ERROR);
singleton->log->add_message(p_string, EditorLog::MSG_TYPE_ERROR);
} else if (p_rich) {
en->log->add_message(p_string, EditorLog::MSG_TYPE_STD_RICH);
singleton->log->add_message(p_string, EditorLog::MSG_TYPE_STD_RICH);
} else {
en->log->add_message(p_string, EditorLog::MSG_TYPE_STD);
singleton->log->add_message(p_string, EditorLog::MSG_TYPE_STD);
}
}

2
editor/editor_node.h
View File

@ -518,8 +518,10 @@ private:
static void _editor_file_dialog_unregister(EditorFileDialog *p_dialog);
static void _file_access_close_error_notify(const String &p_str);
static void _file_access_close_error_notify_impl(const String &p_str);
static void _print_handler(void *p_this, const String &p_string, bool p_error, bool p_rich);
static void _print_handler_impl(const String &p_string, bool p_error, bool p_rich);
static void _resource_saved(Ref<Resource> p_resource, const String &p_path);
static void _resource_loaded(Ref<Resource> p_resource, const String &p_path);