Merge pull request #46670 from Shatur95/fix-enable-created-plugin

Fix enabling of created plugin
godotengine · Mar 9, 2021 · ca1db96 · ca1db96
2 parents 42ca4a4 + c26b451
commit ca1db96
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/editor/plugin_config_dialog.cpp b/editor/plugin_config_dialog.cpp
@@ -112,7 +112,7 @@ void PluginConfigDialog::_on_confirmed() {
 		}
 #endif
 
-		emit_signal("plugin_ready", script.operator->(), active_edit->is_pressed() ? subfolder_edit->get_text() : "");
+		emit_signal("plugin_ready", script.operator->(), active_edit->is_pressed() ? _to_absolute_plugin_path(subfolder_edit->get_text()) : "");
 	} else {
 		EditorNode::get_singleton()->get_project_settings()->update_plugins();
 	}
@@ -129,6 +129,10 @@ void PluginConfigDialog::_on_required_text_changed(const String &) {
 	get_ok_button()->set_disabled(script_edit->get_text().get_basename().is_empty() || script_edit->get_text().get_extension() != ext || name_edit->get_text().is_empty());
 }
 
+String PluginConfigDialog::_to_absolute_plugin_path(const String &p_plugin_name) {
+	return "res://addons/" + p_plugin_name + "/plugin.cfg";
+}
+
 void PluginConfigDialog::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_VISIBILITY_CHANGED: {

diff --git a/editor/plugin_config_dialog.h b/editor/plugin_config_dialog.h
@@ -56,6 +56,8 @@ class PluginConfigDialog : public ConfirmationDialog {
 	void _on_cancelled();
 	void _on_required_text_changed(const String &p_text);
 
+	static String _to_absolute_plugin_path(const String &p_plugin_name);
+
 protected:
 	virtual void _notification(int p_what);
 	static void _bind_methods();