Author: mhutch
Date: 2008-02-05 21:21:13 -0500 (Tue, 05 Feb 2008)
New Revision: 94983

Modified:
   branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/ChangeLog
   
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
Log:
2008-02-05  Michael Hutchinson <[EMAIL PROTECTED]> 

        * MonoDevelop.Ide.Gui/ProjectOperations.cs: End build and run operations
          when the solution is closed (which includes closing MD). Fixes "Bug
          358367 - MD hangs on exit if XSP is still running" and "Bug 356837 -
          Built app doesn't close when solution closes".



Modified: branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/ChangeLog
===================================================================
--- branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/ChangeLog    
2008-02-06 02:20:44 UTC (rev 94982)
+++ branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/ChangeLog    
2008-02-06 02:21:13 UTC (rev 94983)
@@ -1,3 +1,10 @@
+2008-02-05  Michael Hutchinson <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.Ide.Gui/ProjectOperations.cs: End build and run operations
+         when the solution is closed (which includes closing MD). Fixes "Bug
+         358367 - MD hangs on exit if XSP is still running" and "Bug 356837 -
+         Built app doesn't close when solution closes".
+
 2008-02-04  Michael Hutchinson <[EMAIL PROTECTED]> 
 
        * MonoDevelop.Ide.Commands/FileCommands.cs: Dispose new file dialog. 
Fixes

Modified: 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
===================================================================
--- 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
     2008-02-06 02:20:44 UTC (rev 94982)
+++ 
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
     2008-02-06 02:21:13 UTC (rev 94983)
@@ -304,6 +304,12 @@
                                        SaveCombinePreferences ();
                                Combine closedCombine = CurrentOpenCombine;
                                CurrentSelectedProject = null;
+                               
+                               //stop all operations associated with this 
combine
+                               if (!CurrentBuildOperation.IsCompleted)
+                                       CurrentBuildOperation.Cancel ();
+                               if (!CurrentRunOperation.IsCompleted)
+                                       CurrentRunOperation.Cancel ();
 
                                closedCombine.FileAddedToProject -= 
fileAddedToProjectHandler;
                                closedCombine.FileRemovedFromProject -= 
fileRemovedFromProjectHandler;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to