From d3889ad1b4dddd003dbfa7d858cc4ab734f1bb2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 20 Nov 2017 07:40:06 +0100 Subject: [PATCH] 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). --- editor/editor_settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 4726e2deb6c..d228dd2581d 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;