Browse Source

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

(cherry picked from commit 862e2df1a4cce500b7f18158de241b977036366b)
Fredia Huya-Kouadio 4 năm trước cách đây
mục cha
commit
0eb220eedc
1 tập tin đã thay đổi với 0 bổ sung2 xóa
  1. 0 2
      core/project_settings.cpp

+ 0 - 2
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;