diff options
| author | Felix Yang <felixyang117+GitHub@hotmail.com> | 2018-05-01 21:07:41 +0200 |
|---|---|---|
| committer | Felix Yang <felixyang117+GitHub@hotmail.com> | 2018-05-03 10:19:43 +0200 |
| commit | 164dceab283e638ebcd4912d3b3df33d5c630883 (patch) | |
| tree | b198ca904495d8ae07a2fcb7c6f836f7a32fa62a | |
| parent | 1113a738baeabebbee0d51f9c51d4f842fba0fda (diff) | |
Fix for Issue#18457 - Folder name with trailing space on Windows
| -rw-r--r-- | editor/filesystem_dock.cpp | 2 | ||||
| -rw-r--r-- | editor/project_manager.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index ada35073ec..c07e12b67d 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -945,7 +945,7 @@ void FileSystemDock::_make_dir_confirm() { if (dir_name.length() == 0) { EditorNode::get_singleton()->show_warning(TTR("No name provided")); 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")); return; } diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index de98c89db5..666f08cb2d 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -250,8 +250,10 @@ private: 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; + } DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); if (d->change_dir(project_path->get_text()) == OK) { |