Author: jpobst
Date: 2008-02-08 09:52:39 -0500 (Fri, 08 Feb 2008)
New Revision: 95261
Modified:
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
Log:
2008-02-08 Jonathan Pobst <[EMAIL PROTECTED]>
[Backport to 1.9]
* Control.cs: Guard against an NRE in ShowFocusCues.
[Fixes bug #359830]
Modified:
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
---
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-02-08 14:49:37 UTC (rev 95260)
+++
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-02-08 14:52:39 UTC (rev 95261)
@@ -1,3 +1,8 @@
+2008-02-08 Jonathan Pobst <[EMAIL PROTECTED]>
+ [Backport to 1.9]
+ * Control.cs: Guard against an NRE in ShowFocusCues.
+ [Fixes bug #359830]
+
2008-02-06 Ivan N. Zlatev <[EMAIL PROTECTED]>
[Backport to 1.9]
Modified:
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
---
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2008-02-08 14:49:37 UTC (rev 95260)
+++
branches/mono-1-9/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2008-02-08 14:52:39 UTC (rev 95261)
@@ -3566,7 +3566,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
