diff --git a/AsyncImageLoader.Avalonia/AdvancedImage.axaml.cs b/AsyncImageLoader.Avalonia/AdvancedImage.axaml.cs index c0a86d6..3529360 100644 --- a/AsyncImageLoader.Avalonia/AdvancedImage.axaml.cs +++ b/AsyncImageLoader.Avalonia/AdvancedImage.axaml.cs @@ -197,7 +197,7 @@ private async void UpdateImage(string? source, IAsyncImageLoader? loader) { var bitmap = await Task.Run(async () => { try { - if (source == null) + if (string.IsNullOrWhiteSpace(source)) return null; // A small delay allows to cancel early if the image goes out of screen too fast (eg. scrolling) diff --git a/AsyncImageLoader.Avalonia/ImageBrushLoader.cs b/AsyncImageLoader.Avalonia/ImageBrushLoader.cs index 1972fb3..2ce55b9 100644 --- a/AsyncImageLoader.Avalonia/ImageBrushLoader.cs +++ b/AsyncImageLoader.Avalonia/ImageBrushLoader.cs @@ -25,8 +25,8 @@ private static async void OnSourceChanged(ImageBrush imageBrush, AvaloniaPropert Bitmap? bitmap = null; try { - if (newValue is not null) { - bitmap = await AsyncImageLoader.ProvideImageAsync(newValue); + if (!string.IsNullOrWhiteSpace(newValue)) { + bitmap = await AsyncImageLoader.ProvideImageAsync(newValue!); } } catch (Exception e) { diff --git a/AsyncImageLoader.Avalonia/ImageLoader.cs b/AsyncImageLoader.Avalonia/ImageLoader.cs index fc0f06d..3f68c19 100644 --- a/AsyncImageLoader.Avalonia/ImageLoader.cs +++ b/AsyncImageLoader.Avalonia/ImageLoader.cs @@ -40,7 +40,7 @@ private static async void OnSourceChanged(Image sender, AvaloniaPropertyChangedE return new CancellationTokenSource(); }); - if (url == null) { + if (string.IsNullOrWhiteSpace(url)) { ((ICollection>)PendingOperations).Remove( new KeyValuePair(sender, cts)); sender.Source = null;