Merge pull request #94932 from Hilderin/fix-editor-settings-still-displayed-when-replaced

Fix editor settings still displayed when replaced

2 files changed, 13 insertions, 0 deletions

diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index 1cf3a4e0c4..0956d12236 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -998,6 +998,13 @@ const String EditorSettings::_get_project_metadata_path() const {
 	return EditorPaths::get_singleton()->get_project_settings_dir().path_join("project_metadata.cfg");
 }
 
+#ifndef DISABLE_DEPRECATED
+void EditorSettings::_remove_deprecated_settings() {
+	erase("run/output/always_open_output_on_play");
+	erase("run/output/always_close_output_on_stop");
+}
+#endif
+
 // PUBLIC METHODS
 
 EditorSettings *EditorSettings::get_singleton() {
@@ -1078,6 +1085,9 @@ void EditorSettings::create() {
 		singleton->setup_network();
 		singleton->load_favorites_and_recent_dirs();
 		singleton->list_text_editor_themes();
+#ifndef DISABLE_DEPRECATED
+		singleton->_remove_deprecated_settings();
+#endif
 
 		return;
 	}
diff --git a/editor/editor_settings.h b/editor/editor_settings.h
index 6a329f6979..62ac0c60f3 100644
--- a/editor/editor_settings.h
+++ b/editor/editor_settings.h
@@ -114,6 +114,9 @@ private:
 	bool _save_text_editor_theme(const String &p_file);
 	bool _is_default_text_editor_theme(const String &p_theme_name);
 	const String _get_project_metadata_path() const;
+#ifndef DISABLE_DEPRECATED
+	void _remove_deprecated_settings();
+#endif
 
 protected:
 	static void _bind_methods();