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

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

Author: pawel
Date: 2004-04-13 18:04:42 -0400 (Tue, 13 Apr 2004)
New Revision: 1458

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs
   trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs
Log:
fix for bug #56864 (run with warnings)


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-13 21:47:59 UTC (rev 1457)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-13 22:04:42 UTC (rev 1458)
@@ -1,3 +1,9 @@
+2004-04-14  Pawel Rozanski  <tokugawa at afn.no-ip.org>
+
+	* Commands/RunCommands.cs:
+	* Internal/Project/Combine/Combine.cs:
+	fix bug #56864.
+
 2004-04-13  John Luke  <jluke at cfl.rr.com>
 
 	* Gui/BrowserDisplayBinding/HtmlViewPane.cs: use Navbar control

Modified: trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs	2004-04-13 21:47:59 UTC (rev 1457)
+++ trunk/MonoDevelop/src/Main/Base/Commands/RunCommands.cs	2004-04-13 22:04:42 UTC (rev 1458)
@@ -210,7 +210,7 @@
 							if (projectService.NeedsCompiling) {
 								projectService.CompileCombine();
 							}
-							if (taskService.Tasks.Count == 0) {
+							if (taskService.Errors == 0) {
 								projectService.OnBeforeStartProject();
 								projectService.CurrentOpenCombine.Execute();
 							}
@@ -222,7 +222,7 @@
 					} else {
 						if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
 							new Compile().RunWithWait();
-							if (!taskService.SomethingWentWrong) {
+							if (taskService.Errors == 0) {
 								LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
 								ILanguageBinding binding = languageBindingService.GetBindingPerFileName(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
 								if (binding != null) {

Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs	2004-04-13 21:47:59 UTC (rev 1457)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs	2004-04-13 22:04:42 UTC (rev 1458)
@@ -519,7 +519,7 @@
 			TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
 			foreach (ProjectCombineEntry entry in allProjects) {
 				entry.Build(doBuildAll);
-				if (taskService.SomethingWentWrong) {
+				if (taskService.Errors > 0) {
 					break;
 				}
 			}