Fix: Fixed NullReferenceException in DriveItem.LoadThumbnailAsync (#15913)

hishitetsu · web-flow · commit b435574519e7 · 2024-07-30T22:30:05.000-04:00
diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs
@@ -322,15 +322,15 @@ public async Task LoadThumbnailAsync()
 			if (Root is not null)
 			{
 				using var thumbnail = await DriveHelpers.GetThumbnailAsync(Root);
-				IconData ??= await thumbnail.ToByteArrayAsync();
+				IconData ??= thumbnail is not null ? await thumbnail.ToByteArrayAsync() : null;
 			}
 
 			if (string.Equals(DeviceID, "network-folder"))
-				IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Network).IconData;
+				IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Network)?.IconData;
 
-			IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Folder).IconData;
+			IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Folder)?.IconData;
 
-			Icon ??= await IconData.ToBitmapAsync();
+			Icon ??= IconData is not null ? await IconData.ToBitmapAsync() : null;
 		}
 
 		private string GetSizeString()

Original file line number	Diff line number	Diff line change
`@@ -322,15 +322,15 @@ public async Task LoadThumbnailAsync()`
`322`	`322`	`if (Root is not null)`
`323`	`323`	`{`
`324`	`324`	`using var thumbnail = await DriveHelpers.GetThumbnailAsync(Root);`
`325`		`- IconData ??= await thumbnail.ToByteArrayAsync();`
	`325`	`+ IconData ??= thumbnail is not null ? await thumbnail.ToByteArrayAsync() : null;`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`if (string.Equals(DeviceID, "network-folder"))`
`329`		`- IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Network).IconData;`
	`329`	`+ IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Network)?.IconData;`
`330`	`330`
`331`		`- IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Folder).IconData;`
	`331`	`+ IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Folder)?.IconData;`
`332`	`332`
`333`		`- Icon ??= await IconData.ToBitmapAsync();`
	`333`	`+ Icon ??= IconData is not null ? await IconData.ToBitmapAsync() : null;`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`private string GetSizeString()`