Author: mhutch
Date: 2008-02-05 20:37:14 -0500 (Tue, 05 Feb 2008)
New Revision: 94980

Modified:
   trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
   
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
Log:
* 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: trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog   2008-02-06 
01:20:48 UTC (rev 94979)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog   2008-02-06 
01:37:14 UTC (rev 94980)
@@ -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-05  Mike Krüger <[EMAIL PROTECTED]> 
 
        * MonoDevelop.Ide.Gui.Content/IFoldable.cs,

Modified: 
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
===================================================================
--- 
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
    2008-02-06 01:20:48 UTC (rev 94979)
+++ 
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
    2008-02-06 01:37:14 UTC (rev 94980)
@@ -307,6 +307,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