Merge pull request #97491 from akien-mga/fix-filesystem-invalid-icon-crash

akien-mga · akien-mga · commit b181ff28e8b0 · 2024-09-26T18:45:56.000+02:00
Fix EditorFileSystem crash when fetching icons for unknown file types
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
@@ -1978,7 +1978,10 @@ void EditorFileSystem::_update_file_icon_path(EditorFileSystemDirectory::FileInf
 	}
 
 	if (icon_path.is_empty() && !file_info->type.is_empty()) {
-		icon_path = EditorNode::get_singleton()->get_class_icon(file_info->type)->get_path();
+		Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(file_info->type);
+		if (icon.is_valid()) {
+			icon_path = icon->get_path();
+		}
 	}
 
 	file_info->icon_path = icon_path;

Original file line number	Diff line number	Diff line change
`@@ -1978,7 +1978,10 @@ void EditorFileSystem::_update_file_icon_path(EditorFileSystemDirectory::FileInf`
`1978`	`1978`	`}`
`1979`	`1979`
`1980`	`1980`	`if (icon_path.is_empty() && !file_info->type.is_empty()) {`
`1981`		`- icon_path = EditorNode::get_singleton()->get_class_icon(file_info->type)->get_path();`
	`1981`	`+ Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(file_info->type);`
	`1982`	`+ if (icon.is_valid()) {`
	`1983`	`+ icon_path = icon->get_path();`
	`1984`	`+ }`
`1982`	`1985`	`}`
`1983`	`1986`
`1984`	`1987`	`file_info->icon_path = icon_path;`