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

Fix bug causing `project.godot` to be ignored when `project.binary` is missing 

(cherry picked from commit 862e2df1a4)
This commit is contained in:
Fredia Huya-Kouadio 2021-03-15 16:46:14 -07:00 committed by Rémi Verschelde
parent 864f4201b9
commit 0eb220eedc
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/project_settings.cpp
View File

@ -620,7 +620,6 @@ Error ProjectSettings::_load_settings_text_or_binary(const String &p_text_path,
} else if (err != ERR_FILE_NOT_FOUND) { } else if (err != ERR_FILE_NOT_FOUND) {
// If the file exists but can't be loaded, we want to know it. // If the file exists but can't be loaded, we want to know it.
ERR_PRINT("Couldn't load file '" + p_bin_path + "', error code " + itos(err) + "."); ERR_PRINT("Couldn't load file '" + p_bin_path + "', error code " + itos(err) + ".");
return err;
} }
// Fallback to text-based project.godot file if binary was not found. // Fallback to text-based project.godot file if binary was not found.
@ -629,7 +628,6 @@ Error ProjectSettings::_load_settings_text_or_binary(const String &p_text_path,
return OK; return OK;
} else if (err != ERR_FILE_NOT_FOUND) { } else if (err != ERR_FILE_NOT_FOUND) {
ERR_PRINT("Couldn't load file '" + p_text_path + "', error code " + itos(err) + "."); ERR_PRINT("Couldn't load file '" + p_text_path + "', error code " + itos(err) + ".");
return err;
} }
return err; return err;