Browse Source

Merge pull request #47065 from m4gr3d/fallback_to_text_project_godot

Fix bug causing `project.godot` to be ignored when `project.binary` is missing
Rémi Verschelde 4 years ago
parent
commit
d71c9f0005
1 changed files with 0 additions and 2 deletions
  1. 0 2
      core/config/project_settings.cpp

+ 0 - 2
core/config/project_settings.cpp

@@ -643,7 +643,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.
@@ -652,7 +651,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;