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

Fix editor settings still displayed when replaced

This commit is contained in:
Hilderin 2024-07-29 18:24:19 -04:00
parent 0e9caa2d9c
commit 20f4d26510
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/editor_settings.cpp
View File

@ -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"); 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 // PUBLIC METHODS
EditorSettings *EditorSettings::get_singleton() { EditorSettings *EditorSettings::get_singleton() {
@ -1078,6 +1085,9 @@ void EditorSettings::create() {
singleton->setup_network(); singleton->setup_network();
singleton->load_favorites_and_recent_dirs(); singleton->load_favorites_and_recent_dirs();
singleton->list_text_editor_themes(); singleton->list_text_editor_themes();
#ifndef DISABLE_DEPRECATED
singleton->_remove_deprecated_settings();
#endif
return; return;
} }

3
editor/editor_settings.h
View File

@ -114,6 +114,9 @@ private:
bool _save_text_editor_theme(const String &p_file); bool _save_text_editor_theme(const String &p_file);
bool _is_default_text_editor_theme(const String &p_theme_name); bool _is_default_text_editor_theme(const String &p_theme_name);
const String _get_project_metadata_path() const; const String _get_project_metadata_path() const;
#ifndef DISABLE_DEPRECATED
void _remove_deprecated_settings();
#endif
protected: protected:
static void _bind_methods(); static void _bind_methods();