summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-01-14 08:28:41 +0100
committerGitHub <noreply@github.com>2021-01-14 08:28:41 +0100
commit2af5723aee3da89fb4a94f01cf0ac2ba9aa06c18 (patch)
tree778a628406a069afcf71afc245a96156a6c23b8f /editor
parent156d700f004d04e4a03ced23695c627fa3ff3fb3 (diff)
parentb05ff60f6ec6e393e59f9188035b7f4b2e5a8566 (diff)
Merge pull request #45070 from fmazan/fs-dock-name-sort
Fix file name comparison when new file is added to file system
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_file_system.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
index 208f678947..76814ea378 100644
--- a/editor/editor_file_system.cpp
+++ b/editor/editor_file_system.cpp
@@ -1477,20 +1477,21 @@ void EditorFileSystem::update_file(const String &p_file) {
String type = ResourceLoader::get_resource_type(p_file);
if (cpos == -1) {
- //the file did not exist, it was added
+ // The file did not exist, it was added.
- late_added_files.insert(p_file); //remember that it was added. This mean it will be scanned and imported on editor restart
+ late_added_files.insert(p_file); // Remember that it was added. This mean it will be scanned and imported on editor restart.
int idx = 0;
+ String file_name = p_file.get_file();
for (int i = 0; i < fs->files.size(); i++) {
- if (p_file < fs->files[i]->file) {
+ if (file_name < fs->files[i]->file) {
break;
}
idx++;
}
EditorFileSystemDirectory::FileInfo *fi = memnew(EditorFileSystemDirectory::FileInfo);
- fi->file = p_file.get_file();
+ fi->file = file_name;
fi->import_modified_time = 0;
fi->import_valid = ResourceLoader::is_import_valid(p_file);