# HG changeset patch
# User moel.mich
# Date 1274813848 0
# Node ID 76aaf45a01c7108f4febdc5de512bd1dc32e3647
# Parent  2354fdb91ac4b5215acaa7811ae3d707658f4ff4
Added a workaround for the "You must keep the stream open for the lifetime of the Image." problem of the Image.FromStream method. This also reduced the overall memory usage (private working set).

diff -r 2354fdb91ac4 -r 76aaf45a01c7 Utilities/EmbeddedResources.cs
--- a/Utilities/EmbeddedResources.cs	Mon May 24 15:27:46 2010 +0000
+++ b/Utilities/EmbeddedResources.cs	Tue May 25 18:57:28 2010 +0000
@@ -38,6 +38,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.IO;
 using System.Reflection;
 
 namespace OpenHardwareMonitor.Utilities {
@@ -49,10 +50,23 @@
       string[] names = 
         Assembly.GetExecutingAssembly().GetManifestResourceNames();
       for (int i = 0; i < names.Length; i++) {
-        if (names[i].Replace('\\', '.') == name)
-          return new Bitmap(Assembly.GetExecutingAssembly().
-        GetManifestResourceStream(names[i]));
-      }
+        if (names[i].Replace('\\', '.') == name) {
+          using (Stream stream = Assembly.GetExecutingAssembly().
+            GetManifestResourceStream(names[i])) {
+
+            // "You must keep the stream open for the lifetime of the Image."
+            Image image = Image.FromStream(stream);
+
+            // so we just create a copy of the image 
+            Bitmap bitmap = new Bitmap(image);
+
+            // and dispose it right here
+            image.Dispose();
+
+            return bitmap;
+          }
+        }
+      } 
 
       return new Bitmap(1, 1);    
     }
@@ -63,10 +77,13 @@
       string[] names =
         Assembly.GetExecutingAssembly().GetManifestResourceNames();
       for (int i = 0; i < names.Length; i++) {
-        if (names[i].Replace('\\', '.') == name)
-          return new Icon(Assembly.GetExecutingAssembly().
-        GetManifestResourceStream(names[i]));
-      }
+        if (names[i].Replace('\\', '.') == name) {
+          using (Stream stream = Assembly.GetExecutingAssembly().
+            GetManifestResourceStream(names[i])) {
+            return new Icon(stream);
+          }
+        }          
+      } 
 
       return null;
     }