Author: lluis
Date: 2006-01-18 10:50:56 -0500 (Wed, 18 Jan 2006)
New Revision: 55731
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/AggregatedProgressMonitor.cs
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
Log:
2006-01-18 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Core.ProgressMonitoring/AggregatedProgressMonitor.cs:
Don't try to cancel monitors that are already cancelled. Fixes
bug #77100.
* MonoDevelop.Core/Runtime.cs: Runtime is a static class.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog 2006-01-18
15:49:11 UTC (rev 55730)
+++ trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog 2006-01-18
15:50:56 UTC (rev 55731)
@@ -1,3 +1,10 @@
+2006-01-18 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Core.ProgressMonitoring/AggregatedProgressMonitor.cs:
+ Don't try to cancel monitors that are already cancelled. Fixes
+ bug #77100.
+ * MonoDevelop.Core/Runtime.cs: Runtime is a static class.
+
2006-01-11 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Core/GettextCatalog.cs.in: Added some null checks.
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
2006-01-18 15:49:11 UTC (rev 55730)
+++ trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs
2006-01-18 15:50:56 UTC (rev 55731)
@@ -48,6 +48,10 @@
static SetupService setupService;
static bool initialized;
+ private Runtime ()
+ {
+ }
+
public static void Initialize ()
{
if (initialized)
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/AggregatedProgressMonitor.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/AggregatedProgressMonitor.cs
2006-01-18 15:49:11 UTC (rev 55730)
+++
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/AggregatedProgressMonitor.cs
2006-01-18 15:50:56 UTC (rev 55731)
@@ -185,7 +185,7 @@
void IAsyncOperation.Cancel ()
{
foreach (MonitorInfo info in monitors)
- if ((info.ActionMask & MonitorAction.Cancel) !=
0)
+ if ((info.ActionMask & MonitorAction.Cancel) !=
0 && !info.Monitor.IsCancelRequested)
info.Monitor.AsyncOperation.Cancel ();
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches