mirror of
https://github.com/godotengine/godot
synced 2024-09-19 15:08:28 +00:00
Merge pull request #66246 from Jummit/fix-dir-crash
Fix crash when listing files in nonexistent directory
This commit is contained in:
commit
414dd3a257
|
@ -492,6 +492,7 @@ PackedStringArray DirAccess::get_files() {
|
||||||
|
|
||||||
PackedStringArray DirAccess::get_files_at(const String &p_path) {
|
PackedStringArray DirAccess::get_files_at(const String &p_path) {
|
||||||
Ref<DirAccess> da = DirAccess::open(p_path);
|
Ref<DirAccess> da = DirAccess::open(p_path);
|
||||||
|
ERR_FAIL_COND_V_MSG(da.is_null(), PackedStringArray(), vformat("Couldn't open directory at path \"%s\".", p_path));
|
||||||
return da->get_files();
|
return da->get_files();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -501,6 +502,7 @@ PackedStringArray DirAccess::get_directories() {
|
||||||
|
|
||||||
PackedStringArray DirAccess::get_directories_at(const String &p_path) {
|
PackedStringArray DirAccess::get_directories_at(const String &p_path) {
|
||||||
Ref<DirAccess> da = DirAccess::open(p_path);
|
Ref<DirAccess> da = DirAccess::open(p_path);
|
||||||
|
ERR_FAIL_COND_V_MSG(da.is_null(), PackedStringArray(), vformat("Couldn't open directory at path \"%s\".", p_path));
|
||||||
return da->get_directories();
|
return da->get_directories();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue