吞掉取消任务的异常

sovetskyfish · Jun 5, 2020 · d1eb27f · d1eb27f
1 parent 0cd1d62
commit d1eb27f
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/PixivFSUWP/Data/OverAll.cs b/PixivFSUWP/Data/OverAll.cs
@@ -85,12 +85,21 @@ public static async Task<MemoryStream> DownloadImage(string Uri, CancellationTok
                     var bytesCounter = 0L;
                     int bytesRead;
                     byte[] buffer = new byte[4096];
-                    while ((bytesRead = await resStream.ReadAsync(buffer, 0, 4096, CancellationToken)) != 0)
+                    try
                     {
-                        PauseEvent?.WaitOne();
-                        bytesCounter += bytesRead;
-                        await memStream.WriteAsync(buffer, 0, bytesRead, CancellationToken);
-                        _ = ProgressCallback?.Invoke(bytesCounter, length);
+                        while ((bytesRead = await resStream.ReadAsync(buffer, 0, 4096, CancellationToken)) != 0)
+                        {
+                            PauseEvent?.WaitOne();
+                            bytesCounter += bytesRead;
+                            await memStream.WriteAsync(buffer, 0, bytesRead, CancellationToken);
+                            _ = ProgressCallback?.Invoke(bytesCounter, length);
+                        }
+                    }
+                    catch (TaskCanceledException)
+                    { }
+                    catch
+                    {
+                        throw;
                     }
                     memStream.Position = 0;
                     var newCachedFile = await CacheManager.CreateCacheFileAsync(tmpFileName);