Browse Source

Merge pull request #94593 from Hilderin/fix-crash-editor-invalid-editor-settings

Fix editor crash when editor settings resource is invalid
Rémi Verschelde 1 year ago
parent
commit
219cd80af8
1 changed files with 2 additions and 2 deletions
  1. 2 2
      editor/editor_settings.cpp

+ 2 - 2
editor/editor_settings.cpp

@@ -1063,13 +1063,13 @@ void EditorSettings::create() {
 		}
 
 		singleton = ResourceLoader::load(config_file_path, "EditorSettings");
-		singleton->set_path(get_newest_settings_path()); // Settings can be loaded from older version file, so make sure it's newest.
-
 		if (singleton.is_null()) {
 			ERR_PRINT("Could not load editor settings from path: " + config_file_path);
+			config_file_path = get_newest_settings_path();
 			goto fail;
 		}
 
+		singleton->set_path(get_newest_settings_path()); // Settings can be loaded from older version file, so make sure it's newest.
 		singleton->save_changed_setting = true;
 
 		print_verbose("EditorSettings: Load OK!");