2008-09-08 Ivan N. Zlatev <contact@i-nz.net>

* ErrorProvider.cs: Unbreak my previous commit. svn path=/branches/mono-2-0/mcs/; revision=112522
baulig · Sep 8, 2008 · b7db72d · b7db72d
1 parent 7cd4a28
commit b7db72d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-08  Ivan N. Zlatev  <contact@i-nz.net>
+
+	* ErrorProvider.cs: Unbreak my previous commit.
+
 2008-09-08  Ivan N. Zlatev  <contact@i-nz.net>
 
 	* ErrorProvider.cs: Icon should always be 16x16.

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
@@ -412,7 +412,7 @@ public ErrorProvider (IContainer container) : this ()
 			}
 
 			set {
-				if (icon.Height != 16 || icon.Width != 16)
+				if (value != null && (value.Height != 16 || value.Width != 16))
 					icon = new Icon (value, 16, 16);
 				else
 					icon = value;