godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-21 14:57:09 +00:00
Code Releases Wiki Activity

Retry loading addons after filesystem scan

Browse Source
This commit is contained in:
kobewi
2022-12-28 13:56:53 +01:00
parent 5674fa04ae
commit f2367e0782
4 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
editor/editor_node.cpp
View File

@@ -630,6 +630,10 @@ void EditorNode::_notification(int p_what) {
set_addon_plugin_enabled(addons[i], true);
}
_initializing_plugins = false;
if (!pending_addons.is_empty()) {
EditorFileSystem::get_singleton()->connect("script_classes_updated", callable_mp(this, &EditorNode::_enable_pending_addons));
}
}
RenderingServer::get_singleton()->viewport_set_disable_2d(get_scene_root()->get_viewport_rid(), true);
@@ -3487,6 +3491,12 @@ void EditorNode::set_addon_plugin_enabled(const String &p_addon, bool p_enabled,
// Errors in the script cause the base_type to be an empty StringName.
if (scr->get_instance_base_type() == StringName()) {
if (_initializing_plugins) {
// However, if it happens during initialization, waiting for file scan might help.
pending_addons.push_back(p_addon);
return;
}
show_warning(vformat(TTR("Unable to load addon script from path: '%s'. This might be due to a code error in that script.\nDisabling the addon at '%s' to prevent further errors."), script_path, addon_path));
_remove_plugin_from_enabled(addon_path);
return;
@@ -4394,6 +4404,13 @@ void EditorNode::_build_icon_type_cache() {
}
}
void EditorNode::_enable_pending_addons() {
for (uint32_t i = 0; i < pending_addons.size(); i++) {
set_addon_plugin_enabled(pending_addons[i], true);
}
pending_addons.clear();
}
void EditorNode::_file_dialog_register(FileDialog *p_dialog) {
singleton->file_dialogs.insert(p_dialog);
}