Skip to content

Commit 4cc56e1

Browse files
committed
Merge pull request #94932 from Hilderin/fix-editor-settings-still-displayed-when-replaced
Fix editor settings still displayed when replaced
2 parents 372b3f8 + 20f4d26 commit 4cc56e1

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

editor/editor_settings.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,13 @@ const String EditorSettings::_get_project_metadata_path() const {
998998
return EditorPaths::get_singleton()->get_project_settings_dir().path_join("project_metadata.cfg");
999999
}
10001000

1001+
#ifndef DISABLE_DEPRECATED
1002+
void EditorSettings::_remove_deprecated_settings() {
1003+
erase("run/output/always_open_output_on_play");
1004+
erase("run/output/always_close_output_on_stop");
1005+
}
1006+
#endif
1007+
10011008
// PUBLIC METHODS
10021009

10031010
EditorSettings *EditorSettings::get_singleton() {
@@ -1078,6 +1085,9 @@ void EditorSettings::create() {
10781085
singleton->setup_network();
10791086
singleton->load_favorites_and_recent_dirs();
10801087
singleton->list_text_editor_themes();
1088+
#ifndef DISABLE_DEPRECATED
1089+
singleton->_remove_deprecated_settings();
1090+
#endif
10811091

10821092
return;
10831093
}

editor/editor_settings.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ class EditorSettings : public Resource {
114114
bool _save_text_editor_theme(const String &p_file);
115115
bool _is_default_text_editor_theme(const String &p_theme_name);
116116
const String _get_project_metadata_path() const;
117+
#ifndef DISABLE_DEPRECATED
118+
void _remove_deprecated_settings();
119+
#endif
117120

118121
protected:
119122
static void _bind_methods();

0 commit comments

Comments
 (0)