OSDN Git Service

サムネイル表示のキャンセル処理を別スレッドで行う
authorKimura Youichi <kim.upsilon@bucyou.net>
Sun, 29 Jun 2014 03:37:49 +0000 (12:37 +0900)
committerKimura Youichi <kim.upsilon@bucyou.net>
Wed, 2 Jul 2014 10:03:01 +0000 (19:03 +0900)
OpenTween/Tween.cs

index 1cad010..4cfccaa 100644 (file)
@@ -6196,9 +6196,10 @@ namespace OpenTween
                             {
                                 var oldTokenSource = this.thumbnailTokenSource;
 
-                                oldTokenSource.Cancel();
+                                var cancelTask = Task.Run(() => oldTokenSource.Cancel());
 
-                                this.thumbnailTask.ContinueWith(_ => oldTokenSource.Dispose());
+                                Task.WhenAll(this.thumbnailTask, cancelTask)
+                                    .ContinueWith(_ => oldTokenSource.Dispose(), TaskScheduler.Default);
                             }
 
                             this.thumbnailTokenSource = new CancellationTokenSource();