godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fix editor crash when editor settings resource is invalid
This commit is contained in:
Rémi Verschelde 2024-07-22 15:41:10 +02:00
parent c0fae769f8 650981a080
commit 219cd80af8
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_settings.cpp
View File

@ -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!");