Merge pull request #109843 from Muller-Castro/fix-fileaccess-create-temp

Fix `FileAccess::create_temp()` default args error
This commit is contained in:
Thaddeus Crews 2025-09-22 08:50:07 -05:00
commit b4a99e775d
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC

View file

@ -81,12 +81,12 @@ Ref<FileAccess> FileAccess::create_for_path(const String &p_path) {
Ref<FileAccess> FileAccess::create_temp(int p_mode_flags, const String &p_prefix, const String &p_extension, bool p_keep, Error *r_error) { Ref<FileAccess> FileAccess::create_temp(int p_mode_flags, const String &p_prefix, const String &p_extension, bool p_keep, Error *r_error) {
const String ERROR_COMMON_PREFIX = "Error while creating temporary file"; const String ERROR_COMMON_PREFIX = "Error while creating temporary file";
if (!p_prefix.is_valid_filename()) { if (!p_prefix.is_empty() && !p_prefix.is_valid_filename()) {
*r_error = ERR_FILE_BAD_PATH; *r_error = ERR_FILE_BAD_PATH;
ERR_FAIL_V_MSG(Ref<FileAccess>(), vformat(R"(%s: "%s" is not a valid prefix.)", ERROR_COMMON_PREFIX, p_prefix)); ERR_FAIL_V_MSG(Ref<FileAccess>(), vformat(R"(%s: "%s" is not a valid prefix.)", ERROR_COMMON_PREFIX, p_prefix));
} }
if (!p_extension.is_valid_filename()) { if (!p_extension.is_empty() && !p_extension.is_valid_filename()) {
*r_error = ERR_FILE_BAD_PATH; *r_error = ERR_FILE_BAD_PATH;
ERR_FAIL_V_MSG(Ref<FileAccess>(), vformat(R"(%s: "%s" is not a valid extension.)", ERROR_COMMON_PREFIX, p_extension)); ERR_FAIL_V_MSG(Ref<FileAccess>(), vformat(R"(%s: "%s" is not a valid extension.)", ERROR_COMMON_PREFIX, p_extension));
} }