From 0eb220eedc3c2349ecccaa677af6630aa1a81197 Mon Sep 17 00:00:00 2001 From: Fredia Huya-Kouadio Date: Mon, 15 Mar 2021 16:46:14 -0700 Subject: [PATCH] Fix bug causing `project.godot` to be ignored when `project.binary` is missing (cherry picked from commit 862e2df1a4cce500b7f18158de241b977036366b) --- core/project_settings.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/project_settings.cpp b/core/project_settings.cpp index 0d09d03f767..46ab8f5f679 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -620,7 +620,6 @@ Error ProjectSettings::_load_settings_text_or_binary(const String &p_text_path, } else if (err != ERR_FILE_NOT_FOUND) { // 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) + "."); - return err; } // 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; } else if (err != ERR_FILE_NOT_FOUND) { ERR_PRINT("Couldn't load file '" + p_text_path + "', error code " + itos(err) + "."); - return err; } return err;