godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83576 from raulsntos/fix-80883

Browse Source 
Enable new addon after hiding ProjectSettings
This commit is contained in:
Rémi Verschelde 2023-10-30 17:47:23 +01:00
commit 8f0b742a9a
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/editor_node.cpp
View File

@ -827,12 +827,12 @@ void EditorNode::_on_plugin_ready(Object *p_script, const String &p_activate_nam
if (scr.is_null()) { if (scr.is_null()) {
return; return;
} }
if (p_activate_name.length()) {
set_addon_plugin_enabled(p_activate_name, true);
}
project_settings_editor->update_plugins(); project_settings_editor->update_plugins();
project_settings_editor->hide(); project_settings_editor->hide();
push_item(scr.operator->()); push_item(scr.operator->());
if (p_activate_name.length()) {
set_addon_plugin_enabled(p_activate_name, true);
}
} }
void EditorNode::_remove_plugin_from_enabled(const String &p_name) { void EditorNode::_remove_plugin_from_enabled(const String &p_name) {
@ -7372,10 +7372,6 @@ EditorNode::EditorNode() {
project_menu->add_item(TTR("Customize Engine Build Configuration..."), TOOLS_BUILD_PROFILE_MANAGER); project_menu->add_item(TTR("Customize Engine Build Configuration..."), TOOLS_BUILD_PROFILE_MANAGER);
project_menu->add_separator(); project_menu->add_separator();
plugin_config_dialog = memnew(PluginConfigDialog);
plugin_config_dialog->connect("plugin_ready", callable_mp(this, &EditorNode::_on_plugin_ready));
gui_base->add_child(plugin_config_dialog);
tool_menu = memnew(PopupMenu); tool_menu = memnew(PopupMenu);
tool_menu->set_name("Tools"); tool_menu->set_name("Tools");
tool_menu->connect("index_pressed", callable_mp(this, &EditorNode::_tool_menu_option)); tool_menu->connect("index_pressed", callable_mp(this, &EditorNode::_tool_menu_option));

2
editor/editor_node.h
View File

@ -356,8 +356,6 @@ private:
uint64_t started_timestamp = 0; uint64_t started_timestamp = 0;
PluginConfigDialog *plugin_config_dialog = nullptr;
RichTextLabel *load_errors = nullptr; RichTextLabel *load_errors = nullptr;
AcceptDialog *load_error_dialog = nullptr; AcceptDialog *load_error_dialog = nullptr;