Fix: Fixed possible NullReferenceException in widgets (#12171)

hishitetsu · web-flow · commit 39cdc5a6467b · 2023-04-23T09:47:44.000-04:00
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
@@ -61,7 +61,7 @@ public async Task LoadCardThumbnailAsync()
 
 			// Thumbnail data is valid, set the item icon
 			if (thumbnailData is not null && thumbnailData.Length > 0)
-				Thumbnail = await App.Window.DispatcherQueue.EnqueueAsync(() => thumbnailData.ToBitmapAsync(Constants.Widgets.WidgetIconSize));
+				Thumbnail = await thumbnailData.ToBitmapAsync(Constants.Widgets.WidgetIconSize);
 		}
 
 		public int CompareTo(DriveCardItem? other) => Item.Path.CompareTo(other?.Item?.Path);
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -97,7 +97,7 @@ public async Task LoadCardThumbnailAsync()
 			}
 			if (thumbnailData is not null && thumbnailData.Length > 0)
 			{
-				Thumbnail = await App.Window.DispatcherQueue.EnqueueAsync(() => thumbnailData.ToBitmapAsync(Constants.Widgets.WidgetIconSize));
+				Thumbnail = await thumbnailData.ToBitmapAsync(Constants.Widgets.WidgetIconSize);
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public async Task LoadCardThumbnailAsync()`
`61`	`61`
`62`	`62`	`// Thumbnail data is valid, set the item icon`
`63`	`63`	`if (thumbnailData is not null && thumbnailData.Length > 0)`
`64`		`- Thumbnail = await App.Window.DispatcherQueue.EnqueueAsync(() => thumbnailData.ToBitmapAsync(Constants.Widgets.WidgetIconSize));`
	`64`	`+ Thumbnail = await thumbnailData.ToBitmapAsync(Constants.Widgets.WidgetIconSize);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public int CompareTo(DriveCardItem? other) => Item.Path.CompareTo(other?.Item?.Path);`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public async Task LoadCardThumbnailAsync()`
`97`	`97`	`}`
`98`	`98`	`if (thumbnailData is not null && thumbnailData.Length > 0)`
`99`	`99`	`{`
`100`		`- Thumbnail = await App.Window.DispatcherQueue.EnqueueAsync(() => thumbnailData.ToBitmapAsync(Constants.Widgets.WidgetIconSize));`
	`100`	`+ Thumbnail = await thumbnailData.ToBitmapAsync(Constants.Widgets.WidgetIconSize);`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`	`}`