asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FileSystem: Force update when we delete a folder from the editor and searching changes only if we change the directory successfully in the scan_fs_changes

Browse source 
(cherry picked from commit dc76938679)
This commit is contained in:
Mateo Kuruk Miccino 2021-02-27 17:43:26 -03:00 committed by Rémi Verschelde
parent 93cb416423
commit 71a9932f38
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
editor/editor_file_system.cpp
View file

@ -68,6 +68,11 @@ int EditorFileSystemDirectory::find_dir_index(const String &p_dir) const {
return -1; return -1;
} }
void EditorFileSystemDirectory::force_update() {
// We set modified_time to 0 to force `EditorFileSystem::_scan_fs_changes` to search changes in the directory
modified_time = 0;
}
int EditorFileSystemDirectory::get_subdir_count() const { int EditorFileSystemDirectory::get_subdir_count() const {
return subdirs.size(); return subdirs.size();
@ -870,9 +875,11 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const
//then scan files and directories and check what's different //then scan files and directories and check what's different
DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES); DirAccessRef da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
Error ret = da->change_dir(cd);
ERR_FAIL_COND_MSG(ret != OK, "Cannot change to '" + cd + "' folder.");
da->change_dir(cd);
da->list_dir_begin(); da->list_dir_begin();
while (true) { while (true) {
@ -958,7 +965,6 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const
} }
da->list_dir_end(); da->list_dir_end();
memdelete(da);
} }
for (int i = 0; i < p_dir->files.size(); i++) { for (int i = 0; i < p_dir->files.size(); i++) {

2
editor/editor_file_system.h
View file

@ -101,6 +101,8 @@ public:
int find_file_index(const String &p_file) const; int find_file_index(const String &p_file) const;
int find_dir_index(const String &p_dir) const; int find_dir_index(const String &p_dir) const;
void force_update();
EditorFileSystemDirectory(); EditorFileSystemDirectory();
~EditorFileSystemDirectory(); ~EditorFileSystemDirectory();
}; };

4
editor/filesystem_dock.cpp
View file

@ -1330,6 +1330,10 @@ void FileSystemDock::_folder_removed(String p_folder) {
} }
current_path->set_text(path); current_path->set_text(path);
EditorFileSystemDirectory *efd = EditorFileSystem::get_singleton()->get_filesystem_path(path);
if (efd) {
efd->force_update();
}
} }
void FileSystemDock::_rename_operation_confirm() { void FileSystemDock::_rename_operation_confirm() {