[Monodevelop-patches-list] r1297 - in trunk/MonoDevelop/src/Main/Base: . Commands Gui/Workbench/Layouts

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

Author: tberman
Date: 2004-03-29 17:24:32 -0500 (Mon, 29 Mar 2004)
New Revision: 1297

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
Log:
fix bug on project compilation when the executable has already been built, but there *ARE* dirty files that have already been saved... (gotta love it)


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-03-29 21:39:51 UTC (rev 1296)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-03-29 22:24:32 UTC (rev 1297)
@@ -1,3 +1,10 @@
+2004-03-29  Todd Berman  <tberman at sevenl.net>
+
+	* Commands/RunCommands.cs: When you run, you need to make sure the
+	compile completed properly.
+	* Gui/Workbench/Layouts/SdiWorkspaceWindow.cs: Mark file/project dirty
+	if it becomes dirty, relying on unsaved files is not acceptable.
+
 2004-03-28  Todd Berman  <tberman at sevenl.net>
 
 	* Services/ParserService/DefaultParserService.cs: re-add try catch to

Modified: trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs	2004-03-29 21:39:51 UTC (rev 1296)
+++ trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs	2004-03-29 22:24:32 UTC (rev 1297)
@@ -212,8 +212,10 @@
 							if (projectService.NeedsCompiling) {
 								projectService.CompileCombine();
 							}
-							projectService.OnBeforeStartProject();
-							projectService.CurrentOpenCombine.Execute();
+							if (taskService.Tasks.Count == 0) {
+								projectService.OnBeforeStartProject();
+								projectService.CurrentOpenCombine.Execute();
+							}
 							
 						} catch (NoStartupCombineDefinedException) {
 							IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs	2004-03-29 21:39:51 UTC (rev 1296)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs	2004-03-29 22:24:32 UTC (rev 1297)
@@ -183,6 +183,8 @@
 			
 			if (content.IsDirty) {
 				newTitle += "*";
+				IProjectService prj = (IProjectService)ServiceManager.Services.GetService (typeof (IProjectService));
+				prj.MarkFileDirty (content.ContentName);
 			} else if (content.IsReadOnly) {
 				newTitle += "+";
 			}