godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-05 17:15:09 +00:00
Code Releases Wiki Activity

FileSystem dock: Improve duplicate check for directory paths

Browse Source 
Supersedes and closes #30225.
This commit is contained in:
Rémi Verschelde
2019-07-04 11:42:40 +02:00
parent d6d487d7f7
commit c5ea4b27f9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
editor/filesystem_dock.cpp
View File

@@ -1324,14 +1324,14 @@ void FileSystemDock::_duplicate_operation_confirm() {
return; return;
} }
String new_path;
String base_dir = to_duplicate.path.get_base_dir(); String base_dir = to_duplicate.path.get_base_dir();
if (to_duplicate.is_file) { // get_base_dir() returns "some/path" if the original path was "some/path/", so work it around.
new_path = base_dir.plus_file(new_name); if (to_duplicate.path.ends_with("/")) {
} else { base_dir = base_dir.get_base_dir();
new_path = base_dir.substr(0, base_dir.find_last("/")).plus_file(new_name);
} }
String new_path = base_dir.plus_file(new_name);
//Present a more user friendly warning for name conflict //Present a more user friendly warning for name conflict
DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES); DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
if (da->file_exists(new_path) || da->dir_exists(new_path)) { if (da->file_exists(new_path) || da->dir_exists(new_path)) {