diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-20 07:40:06 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-20 07:40:06 +0100 |
| commit | d3889ad1b4dddd003dbfa7d858cc4ab734f1bb2f (patch) | |
| tree | 0edb965e4ffd7e72906be2f152c10418325f831f | |
| parent | 8e6c281a0489ee908eb1666d30b65fb22edba670 (diff) | |
EditorSettings: Dehardcode major in config file name
It was readded in panic after I mistakenly removed the hardcoded "-3" in #12988,
forgetting that Windows would still use the same path and thus conflict with 2.1
(contrarily to macOS and Linux).
| -rw-r--r-- | editor/editor_settings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 4726e2deb6..d228dd2581 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -789,7 +789,7 @@ void EditorSettings::create() { // Validate editor config file - String config_file_name = "editor_settings-3.tres"; + String config_file_name = "editor_settings-" + itos(VERSION_MAJOR) + ".tres"; config_file_path = config_dir.plus_file(config_file_name); if (!dir->file_exists(config_file_name)) { goto fail; |