From 650981a080f876bb42517c82ef46dff05e6d8dc4 Mon Sep 17 00:00:00 2001
From: Hilderin <81109165+Hilderin@users.noreply.github.com>
Date: Sun, 21 Jul 2024 13:26:15 -0400
Subject: [PATCH] Fix editor crash when editor settings resource is invalid

---
 editor/editor_settings.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index 410704837570..1cf3a4e0c415 100644
--- a/editor/editor_settings.cpp
+++ b/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!");