Author: jpobst
Date: 2008-02-20 14:17:19 -0500 (Wed, 20 Feb 2008)
New Revision: 96290
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs
Log:
2008-02-20 Jonathan Pobst <[EMAIL PROTECTED]>
* TreeNode.cs: Guard against an NRE when the parent's
StateImageList hasn't been set.
[Fixes bug #363353]
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-02-20 19:08:43 UTC (rev 96289)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-02-20 19:17:19 UTC (rev 96290)
@@ -1,5 +1,11 @@
2008-02-20 Jonathan Pobst <[EMAIL PROTECTED]>
+ * TreeNode.cs: Guard against an NRE when the parent's
+ StateImageList hasn't been set.
+ [Fixes bug #363353]
+
+2008-02-20 Jonathan Pobst <[EMAIL PROTECTED]>
+
* SplitContainer.cs: Add SupportsTransparentBackColor and
OptimizedDoubleBuffering control styles.
[Fixes bug #363303]
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs
2008-02-20 19:08:43 UTC (rev 96289)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs
2008-02-20 19:17:19 UTC (rev 96290)
@@ -1065,6 +1065,8 @@
internal Image StateImage {
get {
if (TreeView != null) {
+ if (TreeView.StateImageList == null)
+ return null;
if (state_image_index >= 0)
return
TreeView.StateImageList.Images[state_image_index];
if (state_image_key != string.Empty)
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
