Merge pull request #20 from ionite34/patch-1

Fix ObjectDisposedException in Cancellation token access (#19)
AvaloniaUtils · Sep 25, 2023 · 7c543ab · 7c543ab
2 parents 1102e6e + dd07fef
commit 7c543ab
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/AsyncImageLoader.Avalonia/AdvancedImage.axaml.cs b/AsyncImageLoader.Avalonia/AdvancedImage.axaml.cs
@@ -189,8 +189,14 @@ private async void UpdateImage(string? source, IAsyncImageLoader? loader)
 		var cancellationTokenSource = new CancellationTokenSource();
 
         var oldCancellationToken = Interlocked.Exchange(ref _updateCancellationToken, cancellationTokenSource);
-        oldCancellationToken?.Cancel();
-        oldCancellationToken?.Dispose();
+
+        try
+        {
+            oldCancellationToken?.Cancel();
+        }
+        catch (ObjectDisposedException)
+        {
+        }
 
         if (source is null && CurrentImage is not ImageWrapper) {
             // User provided image himself
@@ -232,6 +238,11 @@ private async void UpdateImage(string? source, IAsyncImageLoader? loader)
 			{
 				return null;
 			}
+	                finally
+		        {
+		                cancellationTokenSource.Dispose();
+			}
+
 		}, CancellationToken.None);
 
 		if (cancellationTokenSource.IsCancellationRequested)
@@ -311,4 +322,4 @@ public void Draw(DrawingContext context, Rect sourceRect, Rect destRect) {
         /// <inheritdoc />
         public Size Size => ImageImplementation.Size;
     }
-}
+}