summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-01-11 22:38:00 +0100
committerRémi Verschelde <rverschelde@gmail.com>2017-01-11 22:40:51 +0100
commita23ffb82bbb62b38b6511063fd54e0408b2590c2 (patch)
treea8ff0abc0fea1995706d321a3d3eb10f1c00d14c /tools
parentf698e2be4f52415b329d9cfeac59b7582abbe3bd (diff)
Dehardcode version major in editor settings
Follow-up on 7474fc133a268eae12b7b89307cb0482e3781820.
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/editor_settings.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index e396ac1679..6b4b34fcac 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -328,12 +328,12 @@ void EditorSettings::create() {
// path at least is validated, so validate config file
-
- config_file_path = config_path+"/"+config_dir+"/editor_settings-3.tres";
+ String config_file_name = "editor_settings-" + String(_MKSTR(VERSION_MAJOR)) + ".tres";
+ config_file_path = config_path + "/" + config_dir + "/" + config_file_name;
String open_path = config_file_path;
- if (!dir->file_exists("editor_settings-3.tres")) {
+ if (!dir->file_exists(config_file_name)) {
goto fail;
}