Merge pull request #87563 from jsjtxietian/fix-filesystem-infinite

akien-mga · akien-mga · commit 907db8eebcec · 2024-02-14T14:08:08.000+01:00
Fix editor will freeze when modifying filesystem filter path in Split Mode
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
@@ -979,6 +979,9 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
 			}
 		}
 	} else {
+		if (!directory.begins_with("res://")) {
+			directory = "res://" + directory;
+		}
 		// Get infos on the directory + file.
 		if (directory.ends_with("/") && directory != "res://") {
 			directory = directory.substr(0, directory.length() - 1);

Original file line number	Diff line number	Diff line change
`@@ -979,6 +979,9 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {`
`979`	`979`	`}`
`980`	`980`	`}`
`981`	`981`	`} else {`
	`982`	`+ if (!directory.begins_with("res://")) {`
	`983`	`+ directory = "res://" + directory;`
	`984`	`+ }`
`982`	`985`	`// Get infos on the directory + file.`
`983`	`986`	`if (directory.ends_with("/") && directory != "res://") {`
`984`	`987`	`directory = directory.substr(0, directory.length() - 1);`