Merge pull request #84218 from SaracenOne/naming_conflict_crash

Fix crash on rename collision in thumbnail grid
godotengine · Oct 31, 2023 · 6271f91 · 6271f91
2 parents cf16c69 + c640018
commit 6271f91
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
@@ -1790,7 +1790,9 @@ void FileSystemDock::_rename_operation_confirm() {
 	}
 	if (new_exist) {
 		EditorNode::get_singleton()->show_warning(TTR("A file or folder with this name already exists."));
-		ti->set_text(col_index, old_name);
+		if (ti) {
+			ti->set_text(col_index, old_name);
+		}
 		return;
 	}