tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-07-26 18:19:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Follow-Up Fix Directory Open"

Browse Source 
This reverts commit ec787f0134.
This commit is contained in:
Nathan Franke
2020-07-28 13:53:57 -04:00
committed by Aaron Franke
parent 4c100a593f
commit 9de0439a45
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/bind/core_bind.cpp
+8 -13
View File
@@ -2421,15 +2421,8 @@ int _Directory::get_current_drive() {
}
Error _Directory::change_dir(String p_dir) {
ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory is not configured properly.");
Error err = d->change_dir(p_dir);
if (err != OK) {
return err;
}
dir_open = true;
return OK;
ERR_FAIL_COND_V_MSG(!is_open(), ERR_UNCONFIGURED, "Directory must be opened before use.");
return d->change_dir(p_dir);
}
String _Directory::get_current_dir() {
ERR_FAIL_COND_V_MSG(!is_open(), "", "Directory must be opened before use.");
@@ -2457,7 +2450,8 @@ Error _Directory::make_dir_recursive(String p_dir) {
}
bool _Directory::file_exists(String p_file) {
ERR_FAIL_COND_V_MSG(!d, false, "Directory is not configured properly.");
ERR_FAIL_COND_V_MSG(!is_open(), false, "Directory must be opened before use.");
if (!p_file.is_rel_path()) {
return FileAccess::exists(p_file);
}
@@ -2466,16 +2460,17 @@ bool _Directory::file_exists(String p_file) {
}
bool _Directory::dir_exists(String p_dir) {
ERR_FAIL_COND_V_MSG(!d, false, "Directory is not configured properly.");
ERR_FAIL_COND_V_MSG(!is_open(), false, "Directory must be opened before use.");
if (!p_dir.is_rel_path()) {
DirAccess *d = DirAccess::create_for_path(p_dir);
bool exists = d->dir_exists(p_dir);
memdelete(d);
return exists;
}
return d->dir_exists(p_dir);
} else {
return d->dir_exists(p_dir);
}
}
int _Directory::get_space_left() {