ImageCache.DownloadImageAsync() での再読み込み時にキャッシュ内の画像をDisposeする

diff --git a/OpenTween/ImageCache.cs b/OpenTween/ImageCache.cs
index 532e4ab..9f88eea 100644 (file)
--- a/OpenTween/ImageCache.cs
+++ b/OpenTween/ImageCache.cs
@@ -97,12 +97,20 @@ namespace OpenTween
                 Task<MemoryImage> cachedImageTask = null;
                 lock (this.lockObject)
                 {
-                    if (force)
-                        this.innerDictionary.Remove(address);
-
                     if (this.innerDictionary.ContainsKey(address))
                         cachedImageTask = this.innerDictionary[address];
 
+                    if (force && cachedImageTask != null)
+                    {
+                        this.innerDictionary.Remove(address);
+
+                        if (cachedImageTask.Status == TaskStatus.RanToCompletion)
+                            cachedImageTask.Result.Dispose();
+
+                        cachedImageTask.Dispose();
+                        cachedImageTask = null;
+                    }
+
                     if (cachedImageTask != null)
                         return cachedImageTask;