Skip to content

Commit

Permalink
Merge pull request #90280 from TheSofox/duplicated-folder-reference-fix
Browse files Browse the repository at this point in the history
Fix duplicated folder reference in Godot Editor after changing filename case
  • Loading branch information
akien-mga committed Apr 6, 2024
2 parents 92afd2c + 87b5a56 commit 66dbe35
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions editor/editor_file_system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1367,6 +1367,10 @@ bool EditorFileSystem::_find_file(const String &p_file, EditorFileSystemDirector

String f = ProjectSettings::get_singleton()->localize_path(p_file);

// Note: Only checks if base directory is case sensitive.
Ref<DirAccess> dir = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
bool fs_case_sensitive = dir->is_case_sensitive("res://");

if (!f.begins_with("res://")) {
return false;
}
Expand All @@ -1390,9 +1394,16 @@ bool EditorFileSystem::_find_file(const String &p_file, EditorFileSystemDirector

int idx = -1;
for (int j = 0; j < fs->get_subdir_count(); j++) {
if (fs->get_subdir(j)->get_name() == path[i]) {
idx = j;
break;
if (fs_case_sensitive) {
if (fs->get_subdir(j)->get_name() == path[i]) {
idx = j;
break;
}
} else {
if (fs->get_subdir(j)->get_name().to_lower() == path[i].to_lower()) {
idx = j;
break;
}
}
}

Expand Down

0 comments on commit 66dbe35

Please sign in to comment.