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

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

Author: tberman
Date: 2004-05-26 22:17:19 -0400 (Wed, 26 May 2004)
New Revision: 1651

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs
Log:
makefile generation fix


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-27 01:55:40 UTC (rev 1650)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-27 02:17:19 UTC (rev 1651)
@@ -1,5 +1,10 @@
 2004-05-26  Todd Berman  <tberman at sevenl.net>
 
+	* Internal/Project/Combine/Combine.cs: fix nullref when you dont
+	have a valid single startup project name set.
+
+2004-05-26  Todd Berman  <tberman at sevenl.net>
+
 	* Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs: fix up
 	per edd's suggestions. Now we select a valid node if possible when
 	you remove, and the remove button is only sensitive when an iter is

Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs	2004-05-27 01:55:40 UTC (rev 1650)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs	2004-05-27 02:17:19 UTC (rev 1651)
@@ -685,7 +685,10 @@
 			if (!SingleStartupProject) {
 				stream.WriteLine ("\t at echo `run'ning multiple startup projects is not yet support");
 			} else {
-				stream.WriteLine ("\tcd $(OUTPUTDIR) && mono {0}", GetEntry (SingleStartProjectName).GetOutputName ());
+				if (SingleStartProjectName != null && GetEntry (SingleStartProjectName) != null)
+					stream.WriteLine ("\tcd $(OUTPUTDIR) && mono {0}", GetEntry (SingleStartProjectName).GetOutputName ());
+				else
+					stream.WriteLine ("\t at echo No startup project defined");
 			}
 			stream.WriteLine ();