Fix "CancellationTokenSource has been disposed" when redrawn rapidly …

…in virtualizing panels. #19
AvaloniaUtils · Sep 23, 2023 · 1102e6e · 1102e6e
1 parent 830e2bf
commit 1102e6e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/AsyncImageLoader.Avalonia/AdvancedImage.axaml.cs b/AsyncImageLoader.Avalonia/AdvancedImage.axaml.cs
@@ -186,20 +186,22 @@ private void ClearSourceIfUserProvideImage() {
 
     private async void UpdateImage(string? source, IAsyncImageLoader? loader)
     {
-		_updateCancellationToken?.Cancel();
-		_updateCancellationToken?.Dispose();
-        _updateCancellationToken = null;
+		var cancellationTokenSource = new CancellationTokenSource();
+
+        var oldCancellationToken = Interlocked.Exchange(ref _updateCancellationToken, cancellationTokenSource);
+        oldCancellationToken?.Cancel();
+        oldCancellationToken?.Dispose();
+
         if (source is null && CurrentImage is not ImageWrapper) {
             // User provided image himself
             return;
         }
 
-		var cancellationTokenSource = _updateCancellationToken = new CancellationTokenSource();
 		IsLoading = true;
 		CurrentImage = null;
 
 
-		Bitmap? bitmap = await Task.Run(async () =>
+		var bitmap = await Task.Run(async () =>
 		{
 			try
 			{
@@ -230,7 +232,7 @@ private async void UpdateImage(string? source, IAsyncImageLoader? loader)
 			{
 				return null;
 			}
-		});
+		}, CancellationToken.None);
 
 		if (cancellationTokenSource.IsCancellationRequested)
             return;

diff --git a/AsyncImageLoader.Avalonia/AsyncImageLoader.Avalonia.csproj b/AsyncImageLoader.Avalonia/AsyncImageLoader.Avalonia.csproj
@@ -15,9 +15,9 @@
         <RepositoryType>git</RepositoryType>
         <PackageTags>image cross-platform avalonia avaloniaui c-sharp-library</PackageTags>
         <PackageReadmeFile>README.md</PackageReadmeFile>
-        <Version>3.2.0</Version>
+        <Version>3.2.1-rc1</Version>
         <PackageReleaseNotes>
-- Add support for existing IImage loading in AdvancedImage
+- Tries to fix "CancellationTokenSource has been disposed" when redrawn rapidly in virtualizing panels
         </PackageReleaseNotes>
     </PropertyGroup>