Author: jpobst
Date: 2008-02-08 09:49:37 -0500 (Fri, 08 Feb 2008)
New Revision: 95260
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
Log:
2008-02-08 Jonathan Pobst <[EMAIL PROTECTED]>
* Control.cs: Guard against an NRE in ShowFocusCues.
[Fixes bug #359830]
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-02-08 14:34:22 UTC (rev 95259)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-02-08 14:49:37 UTC (rev 95260)
@@ -1,3 +1,8 @@
+2008-02-08 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * Control.cs: Guard against an NRE in ShowFocusCues.
+ [Fixes bug #359830]
+
2008-02-08 Carlos Alberto Cortez <[EMAIL PROTECTED]>
* Binding.cs: Implement 2.0 ReadValue method and ControlUpdateMode
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2008-02-08 14:34:22 UTC (rev 95259)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2008-02-08 14:49:37 UTC (rev 95260)
@@ -3582,7 +3582,12 @@
if (this.parent == null)
return false;
- return this.FindForm ().show_focus_cues;
+ Form f = this.FindForm ();
+
+ if (f != null)
+ return f.show_focus_cues;
+
+ return false;
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
