[Monodevelop-patches-list] r1833 - in trunk/MonoDevelop/src/Main/Base: . Services/Project

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-06-25 20:06:14 -0400 (Fri, 25 Jun 2004)
New Revision: 1833

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs
Log:
try catch around xmldocument load, closes 60417.


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-06-25 23:57:58 UTC (rev 1832)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-06-26 00:06:14 UTC (rev 1833)
@@ -1,5 +1,11 @@
 2004-06-25  Todd Berman  <tberman at off.net>
 
+	* Services/Project/DefaultProjectService.cs: When restoring combine
+	preferences, if xml document is invalid, just return, closes bug
+	#60417.
+
+2004-06-25  Todd Berman  <tberman at off.net>
+
 	* Gui/Dialogs/SharpDevelopAboutPanels.cs: Removing ASP mention at
 	the request of Mike Krueger.
 

Modified: trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs	2004-06-25 23:57:58 UTC (rev 1832)
+++ trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs	2004-06-26 00:06:14 UTC (rev 1833)
@@ -497,7 +497,11 @@
 			
 			if (files.Length > 0) {
 				XmlDocument doc = new XmlDocument();
-				doc.Load(files[0]);
+				try {
+					doc.Load(files[0]);
+				} catch (Exception) {
+					return;
+				}
 				XmlElement root = doc.DocumentElement;
 				string combinepath = Path.GetDirectoryName(combinefilename);
 				if (root["Files"] != null) {