From 12f39befa973ddafdfe1fef10887887b6b2442f6 Mon Sep 17 00:00:00 2001 From: kobewi Date: Fri, 19 Apr 2024 00:09:15 +0200 Subject: Use minor version in EditorSettings file name --- main/main.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'main') diff --git a/main/main.cpp b/main/main.cpp index 801e8934b0..78a539fff7 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -2518,12 +2518,10 @@ Error Main::setup2() { // Editor setting class is not available, load config directly. if (!init_use_custom_screen && (editor || project_manager) && EditorPaths::get_singleton()->are_paths_valid()) { - Ref dir = DirAccess::open(EditorPaths::get_singleton()->get_config_dir()); - ERR_FAIL_COND_V(dir.is_null(), FAILED); + ERR_FAIL_COND_V(!DirAccess::dir_exists_absolute(EditorPaths::get_singleton()->get_config_dir()), FAILED); - String config_file_name = "editor_settings-" + itos(VERSION_MAJOR) + ".tres"; - String config_file_path = EditorPaths::get_singleton()->get_config_dir().path_join(config_file_name); - if (dir->file_exists(config_file_name)) { + String config_file_path = EditorSettings::get_existing_settings_path(); + if (FileAccess::exists(config_file_path)) { Error err; Ref f = FileAccess::open(config_file_path, FileAccess::READ, &err); if (f.is_valid()) { -- cgit v1.2.3