[Monodevelop-patches-list] r2666 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Internal/Project/Combine

[Lluis Sanchez <lluis@ximian.com>]

Author: lluis
Date: 2005-07-18 11:04:49 -0400 (Mon, 18 Jul 2005)
New Revision: 2666

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs
Log:
2005-07-18  Lluis Sanchez Gual  <lluis at novell.com>

	* Internal/Project/Combine/Combine.cs: Make sure StartupEntry returns
	the correct value after the deserialization of startEntryName.



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-18 14:15:17 UTC (rev 2665)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-18 15:04:49 UTC (rev 2666)
@@ -1,3 +1,8 @@
+2005-07-18  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Internal/Project/Combine/Combine.cs: Make sure StartupEntry returns
+	the correct value after the deserialization of startEntryName.
+
 2005-07-18  Lluis Sanchez Gual  <lluis at novell.com> 
 
 	* Gui/Dialogs/NewProjectDialog.cs: Don't continue with project creation

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs	2005-07-18 14:15:17 UTC (rev 2665)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs	2005-07-18 15:04:49 UTC (rev 2666)
@@ -229,6 +229,7 @@
 		{
 			try {
 				deserializing = true;
+				startupEntry = null;
 				
 				// Clean the configuration list, since entries added while deserializing
 				// could have generated default configurations.