Fix: Fixed issue where drives sometimes had the wrong thumbnail (#12275)

hecksmosis · web-flow · commit 079091b0811c · 2023-05-04T13:38:27.000-04:00
diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs
@@ -249,6 +249,9 @@ public async Task LoadThumbnailAsync(bool isSidebar = false)
 				if (!string.IsNullOrEmpty(DeviceID) && !string.Equals(DeviceID, "network-folder"))
 					IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, 24);
 
+				using var thumbnail = await DriveHelpers.GetThumbnailAsync(Root);
+				IconData ??= await thumbnail.ToByteArrayAsync();
+
 				IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Folder).IconData;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,9 @@ public async Task LoadThumbnailAsync(bool isSidebar = false)`
`249`	`249`	`if (!string.IsNullOrEmpty(DeviceID) && !string.Equals(DeviceID, "network-folder"))`
`250`	`250`	`IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, 24);`
`251`	`251`
	`252`	`+ using var thumbnail = await DriveHelpers.GetThumbnailAsync(Root);`
	`253`	`+ IconData ??= await thumbnail.ToByteArrayAsync();`
	`254`	`+`
`252`	`255`	`IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Folder).IconData;`
`253`	`256`	`}`
`254`	`257`