[Monodevelop-patches-list] r2609 - trunk/MonoDevelop/Core/src/MonoDevelop.Dock

[John Luke <jluke@cfl.rr.com>]

Author: jluke
Date: 2005-06-27 18:05:31 -0400 (Mon, 27 Jun 2005)
New Revision: 2609

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockLayout.cs
Log:
(SetupObject) guard against missing name attribute



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog	2005-06-27 21:51:23 UTC (rev 2608)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog	2005-06-27 22:05:31 UTC (rev 2609)
@@ -1,6 +1,9 @@
 2005-06-27  John Luke  <john.luke at gmail.com>
 
 	* DockLayout.cs: catch exception on invalid XML
+	(SetupObject) guard against missing name attribute
+	part of bug #75289, based on patch from
+	Matthew Wright <matthew at willowgreen.f2s.com>
 
 2005-06-04  John Luke  <john.luke at gmail.com>
 

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockLayout.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockLayout.cs	2005-06-27 21:51:23 UTC (rev 2608)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockLayout.cs	2005-06-27 22:05:31 UTC (rev 2609)
@@ -462,7 +462,9 @@
 				return dp;
 			}
 
-			string name = node.Attributes["name"].Value;
+			string name = null;
+			if (node.Attributes["name"] != null)
+				name = node.Attributes["name"].Value;
 
 			if (name != null && name.Length > 0) {
 				obj = master.GetObject (name);