diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-24 16:34:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 16:34:41 +0200 |
| commit | 521aad3dca45ccc3d914fa3942bc929f4fb18c7d (patch) | |
| tree | c668456e03c3eed5dae159c9e1b30d338f61c2f8 | |
| parent | 2bf28f58ac11b82ea3ed9216b18dcf954b55eeee (diff) | |
| parent | 9d309096c9999b7c3da02781e4a6adda5933dbb3 (diff) | |
Merge pull request #28467 from kpkhxlgy0/fix-exfat
fix file system not refresh on exFAT
| -rw-r--r-- | editor/editor_file_system.cpp | 6 | ||||
| -rw-r--r-- | editor/editor_file_system.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index 90af593166..4ddb28b440 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -844,7 +844,7 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const bool updated_dir = false; String cd = p_dir->get_path(); - if (current_mtime != p_dir->modified_time || using_fat_32) { + if (current_mtime != p_dir->modified_time || using_fat32_or_exfat) { updated_dir = true; p_dir->modified_time = current_mtime; @@ -2140,8 +2140,8 @@ EditorFileSystem::EditorFileSystem() { if (da->change_dir("res://.import") != OK) { da->make_dir("res://.import"); } - //this should probably also work on Unix and use the string it returns for FAT32 - using_fat_32 = da->get_filesystem_type() == "FAT32"; + // This should probably also work on Unix and use the string it returns for FAT32 or exFAT + using_fat32_or_exfat = (da->get_filesystem_type() == "FAT32" || da->get_filesystem_type() == "exFAT"); memdelete(da); scan_total = 0; diff --git a/editor/editor_file_system.h b/editor/editor_file_system.h index 8943706202..72d9489f21 100644 --- a/editor/editor_file_system.h +++ b/editor/editor_file_system.h @@ -237,7 +237,7 @@ class EditorFileSystem : public Node { static Error _resource_import(const String &p_path); - bool using_fat_32; //workaround for projects in FAT32 filesystem (pendrives, most of the time) + bool using_fat32_or_exfat; // Workaround for projects in FAT32 or exFAT filesystem (pendrives, most of the time) void _find_group_files(EditorFileSystemDirectory *efd, Map<String, Vector<String> > &group_files, Set<String> &groups_to_reimport); |