Author: andreia
Date: 2008-02-08 10:43:19 -0500 (Fri, 08 Feb 2008)
New Revision: 95266
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
Log:
* Form.cs: Add a null check (darn it).
2008-02-08 Andreia Gaita <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-02-08 15:41:45 UTC (rev 95265)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-02-08 15:43:19 UTC (rev 95266)
@@ -1,3 +1,7 @@
+2008-02-08 Andreia Gaita <[EMAIL PROTECTED]>
+
+ * Form.cs: Add a null check (darn it).
+
2008-02-08 Jonathan Pobst <[EMAIL PROTECTED]>
* MdiClient.cs: Make sure the requesting form actually owns the
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2008-02-08 15:41:45 UTC (rev 95265)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2008-02-08 15:43:19 UTC (rev 95266)
@@ -2610,7 +2610,7 @@
Hide ();
} else {
Dispose ();
- if (act != this)
+ if (act != null && act != this)
act.SelectActiveControl ();
}
mdi_parent = null;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
