1 files changed, 15 insertions, 11 deletions

diff --git a/editor/editor_dir_dialog.cpp b/editor/editor_dir_dialog.cpp
index f181c04004..4071722185 100644
--- a/editor/editor_dir_dialog.cpp
+++ b/editor/editor_dir_dialog.cpp
@@ -81,15 +81,15 @@ void EditorDirDialog::reload(const String &p_path) {
 void EditorDirDialog::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
-			EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &EditorDirDialog::reload), make_binds(""));
+			EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &EditorDirDialog::reload).bind(""));
 			reload();
 
 			if (!tree->is_connected("item_collapsed", callable_mp(this, &EditorDirDialog::_item_collapsed))) {
-				tree->connect("item_collapsed", callable_mp(this, &EditorDirDialog::_item_collapsed), varray(), CONNECT_DEFERRED);
+				tree->connect("item_collapsed", callable_mp(this, &EditorDirDialog::_item_collapsed), CONNECT_DEFERRED);
 			}
 
 			if (!EditorFileSystem::get_singleton()->is_connected("filesystem_changed", callable_mp(this, &EditorDirDialog::reload))) {
-				EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &EditorDirDialog::reload), make_binds(""));
+				EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &EditorDirDialog::reload).bind(""));
 			}
 		} break;
 
@@ -156,10 +156,18 @@ void EditorDirDialog::_make_dir_confirm() {
 
 	String dir = ti->get_metadata(0);
 
-	DirAccessRef d = DirAccess::open(dir);
-	ERR_FAIL_COND_MSG(!d, "Cannot open directory '" + dir + "'.");
-	Error err = d->make_dir(makedirname->get_text());
+	Ref<DirAccess> d = DirAccess::open(dir);
+	ERR_FAIL_COND_MSG(d.is_null(), "Cannot open directory '" + dir + "'.");
 
+	const String stripped_dirname = makedirname->get_text().strip_edges();
+
+	if (d->dir_exists(stripped_dirname)) {
+		mkdirerr->set_text(TTR("Could not create folder. File with that name already exists."));
+		mkdirerr->popup_centered();
+		return;
+	}
+
+	Error err = d->make_dir(stripped_dirname);
 	if (err != OK) {
 		mkdirerr->popup_centered(Size2(250, 80) * EDSCALE);
 	} else {
@@ -175,8 +183,6 @@ void EditorDirDialog::_bind_methods() {
 }
 
 EditorDirDialog::EditorDirDialog() {
-	updating = false;
-
 	set_title(TTR("Choose a Directory"));
 	set_hide_on_ok(false);
 
@@ -205,7 +211,5 @@ EditorDirDialog::EditorDirDialog() {
 	mkdirerr->set_text(TTR("Could not create folder."));
 	add_child(mkdirerr);
 
-	get_ok_button()->set_text(TTR("Choose"));
-
-	must_reload = false;
+	set_ok_button_text(TTR("Choose"));
 }