dev
| Revision | ba4365440880c4687772323165fdf333a3cfb79a (tree) |
|---|---|
| Time | 2014-02-01 06:19:09 |
| Author | Kimura Youichi <kim.upsilon@bucy...> |
| Commiter | Kimura Youichi |
サムネイル画像の取得時にキャンセルされると WebException が正常にハンドルされない場合がある問題を修正
OpenTween/Resources/ChangeLog.txt (diff)
OpenTween/Thumbnail/Services/Pixiv.cs (diff) OpenTween/Thumbnail/ThumbnailInfo.cs (diff) OpenTween/TweetThumbnail.cs (diff)| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | 更新履歴 |
| 2 | 2 | |
| 3 | 3 | ==== Ver 1.1.8-beta1(2014/xx/xx) |
| 4 | + * FIX: サムネイル画像の取得をキャンセルするとエラーが発生する場合がある問題の修正 | |
| 4 | 5 | |
| 5 | 6 | ==== Ver 1.1.7(2014/01/16) |
| 6 | 7 | * NEW: ダイレクトメッセージに添付された画像のサムネイル表示に対応 |
| @@ -61,7 +61,7 @@ namespace OpenTween.Thumbnail.Services | ||
| 61 | 61 | client.Headers[HttpRequestHeader.Referer] = this.ImageUrl; |
| 62 | 62 | |
| 63 | 63 | var task = client.DownloadDataAsync(new Uri(this.ThumbnailUrl), token) |
| 64 | - .ContinueWith(t => MemoryImage.CopyFromBytes(t.Result), token); | |
| 64 | + .ContinueWith(t => MemoryImage.CopyFromBytes(t.Result)); | |
| 65 | 65 | |
| 66 | 66 | task.ContinueWith(_ => client.Dispose()); |
| 67 | 67 |
| @@ -45,7 +45,7 @@ namespace OpenTween.Thumbnail | ||
| 45 | 45 | var client = new OTWebClient(); |
| 46 | 46 | |
| 47 | 47 | var task = client.DownloadDataAsync(new Uri(this.ThumbnailUrl), token) |
| 48 | - .ContinueWith(t => MemoryImage.CopyFromBytes(t.Result), token); | |
| 48 | + .ContinueWith(t => MemoryImage.CopyFromBytes(t.Result)); | |
| 49 | 49 | |
| 50 | 50 | task.ContinueWith(_ => client.Dispose()); |
| 51 | 51 |
| @@ -90,7 +90,7 @@ namespace OpenTween | ||
| 90 | 90 | .ContinueWith(t2 => |
| 91 | 91 | { |
| 92 | 92 | if (t2.IsFaulted) |
| 93 | - t2.Exception.Flatten().Handle(x => x is WebException || x is InvalidImageException); | |
| 93 | + t2.Exception.Flatten().Handle(x => x is WebException || x is InvalidImageException || x is TaskCanceledException); | |
| 94 | 94 | |
| 95 | 95 | if (t2.IsFaulted || t2.IsCanceled) |
| 96 | 96 | { |
Fork