godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for Issue#18457 - Folder name with trailing space on Windows 

(cherry picked from commit 164dceab28)
This commit is contained in:
Felix Yang 2018-05-01 21:07:41 +02:00 committed by Hein-Pieter van Braam
parent 736e574a5e
commit 78e2e48d57
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/filesystem_dock.cpp
View File

@ -917,7 +917,7 @@ void FileSystemDock::_make_dir_confirm() {
if (dir_name.length() == 0) { if (dir_name.length() == 0) {
EditorNode::get_singleton()->show_warning(TTR("No name provided")); EditorNode::get_singleton()->show_warning(TTR("No name provided"));
return; return;
} else if (dir_name.find("/") != -1 || dir_name.find("\\") != -1 || dir_name.find(":") != -1 || dir_name.ends_with(".")) { } else if (dir_name.find("/") != -1 || dir_name.find("\\") != -1 || dir_name.find(":") != -1 || dir_name.ends_with(".") || dir_name.ends_with(" ")) {
EditorNode::get_singleton()->show_warning(TTR("Provided name contains invalid characters")); EditorNode::get_singleton()->show_warning(TTR("Provided name contains invalid characters"));
return; return;
} }

4
editor/project_manager.cpp
View File

@ -250,8 +250,10 @@ private:
void _create_folder() { void _create_folder() {
if (project_name->get_text() == "" || created_folder_path != "") if (project_name->get_text() == "" || created_folder_path != "" || project_name->get_text().ends_with(".") || project_name->get_text().ends_with(" ")) {
set_message(TTR("Invalid Project Name."), MESSAGE_WARNING);
return; return;
}
DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
if (d->change_dir(project_path->get_text()) == OK) { if (d->change_dir(project_path->get_text()) == OK) {