Merge pull request #5211 from bclothier/PlugWPFLeak

Plug the WPF leak... maybe.
rubberduck-vba · Oct 13, 2019 · 06b1501 · 06b1501
2 parents 37c252e + 6bef5f6
commit 06b1501
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/Rubberduck.Core/UI/Converters/ImageSourceConverter.cs b/Rubberduck.Core/UI/Converters/ImageSourceConverter.cs
@@ -12,17 +12,19 @@ public abstract class ImageSourceConverter : IValueConverter
     {
         protected static ImageSource ToImageSource(Image source)
         {
-            var ms = new MemoryStream();
+            using (var ms = new MemoryStream())
+            {
+                ((Bitmap) source).Save(ms, System.Drawing.Imaging.ImageFormat.Png);
+                var image = new BitmapImage();
+                image.BeginInit();
+                image.CacheOption = BitmapCacheOption.OnLoad;
+                ms.Seek(0, SeekOrigin.Begin);
+                image.StreamSource = ms;
+                image.EndInit();
+                image.Freeze();
 
-            ((Bitmap)source).Save(ms, System.Drawing.Imaging.ImageFormat.Png);
-            var image = new BitmapImage();
-            image.BeginInit();
-            ms.Seek(0, SeekOrigin.Begin);
-            image.StreamSource = ms;
-            image.EndInit();
-            image.Freeze();
-
-            return image;
+                return image;
+            }
         }
 
         public abstract object Convert(object value, Type targetType, object parameter, CultureInfo culture);