Merge pull request #40528 from nathanfranke/fix-directory-make-dir

Fix Directory make_dir and make_dir_recursive
This commit is contained in:
Rémi Verschelde 2020-07-20 13:53:51 +02:00 committed by GitHub
commit 84fe3d7df5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1690,7 +1690,7 @@ String _Directory::get_current_dir() {
}
Error _Directory::make_dir(String p_dir) {
ERR_FAIL_COND_V_MSG(!is_open(), ERR_UNCONFIGURED, "Directory must be opened before use.");
ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory is not configured properly.");
if (!p_dir.is_rel_path()) {
DirAccess *d = DirAccess::create_for_path(p_dir);
Error err = d->make_dir(p_dir);
@ -1701,7 +1701,7 @@ Error _Directory::make_dir(String p_dir) {
}
Error _Directory::make_dir_recursive(String p_dir) {
ERR_FAIL_COND_V_MSG(!is_open(), ERR_UNCONFIGURED, "Directory must be opened before use.");
ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory is not configured properly.");
if (!p_dir.is_rel_path()) {
DirAccess *d = DirAccess::create_for_path(p_dir);
Error err = d->make_dir_recursive(p_dir);