Merge pull request #1155 from steffen-kiess/json-string

[mono.git] / mcs / class / System.Drawing.Design / System.Drawing.Design / IconEditor.cs

diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design/IconEditor.cs b/mcs/class/System.Drawing.Design/System.Drawing.Design/IconEditor.cs
index cf2531924dec0e967b45813476eafa4aad101f21..9b4ce1d9e5e2477847281c75d9765f6545267de4 100644 (file)
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design/IconEditor.cs
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design/IconEditor.cs
@@ -129,8 +129,10 @@ namespace System.Drawing.Design
                        Graphics G = e.Graphics;
 
                        if (e.Value != null) {
-                               Image I = (Image) e.Value;
-                               G.DrawImage (I, e.Bounds);
+                               Icon i = (Icon) e.Value;
+                               Image img = i.ToBitmap ();
+                               G.DrawImage (img, e.Bounds);
+                               img.Dispose ();
                        }
 
                        G.DrawRectangle (Pens.Black, e.Bounds);