[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] r81114 - in
From:       "Lluis Sanchez (lluis () ximian ! com)" <mono-patches-list () lists ! ximian ! com>
Date:       2007-06-30 15:30:23
Message-ID: 20070630153023.814479472C () mono-cvs ! ximian ! com
[Download RAW message or body]

Author: lluis
Date: 2007-06-30 11:30:23 -0400 (Sat, 30 Jun 2007)
New Revision: 81114

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/ChangeLog
   trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/CombineOptionsDialog.cs
 Log:
* MonoDevelop.Projects.Gui.Dialogs/CombineOptionsDialog.cs: When a
  solution contains a reference to an unknown project type (perhaps
  the addin is not available on the machine) an exception occurs when
  viewing the configuration properties for the solution. Patch by
  Jerome Haltom.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/ChangeLog	2007-06-30 15:28:22 \
                UTC (rev 81113)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/ChangeLog	2007-06-30 15:30:23 \
UTC (rev 81114) @@ -1,3 +1,11 @@
+2007-06-30  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.Projects.Gui.Dialogs/CombineOptionsDialog.cs: When a
+	  solution contains a reference to an unknown project type (perhaps
+	  the addin is not available on the machine) an exception occurs when
+	  viewing the configuration properties for the solution. Patch by
+	  Jerome Haltom.
+
 2007-06-23 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
 
 	* MonoDevelop.Projects.Gui.addin.xml: Fixed capitalization.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/CombineOptionsDialog.cs
 ===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/CombineOptionsDialog.cs	2007-06-30 \
                15:28:22 UTC (rev 81113)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/CombineOptionsDialog.cs	2007-06-30 \
15:30:23 UTC (rev 81114) @@ -139,10 +139,11 @@
 			ConfigurationData data = new ConfigurationData (entry);
 			foreach (IConfiguration conf in entry.Configurations) {
 				IConfiguration copy = entry.CreateConfiguration (conf.Name);
-				copy.CopyFrom (conf);
-				data.Configurations.Add (copy);
+				if (copy != null) {
+					copy.CopyFrom (conf);
+					data.Configurations.Add (copy);
+				}
 			}
-			
 			if (entry is Combine) {
 				foreach (CombineEntry e in ((Combine)entry).Entries)
 					data.Children.Add (ConfigurationData.Build (e));

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches


[prev in list] [next in list] [prev in thread] [next in thread]