終了処理のImageCacheDictionaryの後始末に無駄なコードパスがあったのを修正

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@842 e39ad16e-3079-482e-bb30-4b4d378143b6

diff --git a/Tween/ImageCacheDictionary.vb b/Tween/ImageCacheDictionary.vb
index 723020a..6188122 100644 (file)
--- a/Tween/ImageCacheDictionary.vb
+++ b/Tween/ImageCacheDictionary.vb
@@ -178,7 +178,12 @@ Public Class ImageCacheDictionary
         Public ReadOnly Property Image As Image
             Get
                 If Me.img Is Nothing Then
-                    Me.img = Image.FromFile(Me.tmpFilePath)
+                    Try
+                        Me.img = Image.FromFile(Me.tmpFilePath)
+                    Catch ex As OutOfMemoryException
+                        File.Copy(Me.tmpFilePath, Path.Combine(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory), "TweenCache"), Path.GetFileName(Me.tmpFilePath)))
+                        Throw ex
+                    End Try
                 End If
 
                 Return Me.img

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index 5e798df..7fab3e8 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -319,12 +319,6 @@ Public Class TweenMain
         fDialog.Dispose()
         UrlDialog.Dispose()
         _spaceKeyCanceler.Dispose()
-        If TIconDic IsNot Nothing AndAlso TIconDic.Keys.Count > 0 Then
-            For Each key As String In TIconDic.Keys
-                TIconDic(key).Dispose()
-            Next
-            TIconDic.Clear()
-        End If
         DirectCast(TIconDic, IDisposable).Dispose()
         If NIconAt IsNot Nothing Then NIconAt.Dispose()
         If NIconAtRed IsNot Nothing Then NIconAtRed.Dispose()
@@ -987,7 +981,7 @@ Public Class TweenMain
         End If
 
         'アイコンリスト作成
-        TIconDic = New ImageCacheDictionary(3000)
+        TIconDic = New ImageCacheDictionary(50)
 
         tw.DetailIcon = TIconDic