Fix for dispose of ComputeRelativeTimesProgressMonitor

csharp/ProgressMonitor/ProgressMonitor.csproj

@@ -46,6 +46,7 @@
     <Compile Include="console\widget\ElapsedWidget.cs" />
     <Compile Include="console\widget\TextWidget.cs" />
     <Compile Include="devel\ComputeRelativeTimesProgressMonitor.cs" />
+    <Compile Include="utils\ActionDisposable.cs" />
     <Compile Include="utils\FilteredFlatProgressMonitor.cs" />
     <Compile Include="utils\FlatToHierarchicalProgressMonitor.cs" />
     <Compile Include="console\MachineReadableConsole.cs" />

csharp/ProgressMonitor/devel/ComputeRelativeTimesProgressMonitor.cs

@@ -20,7 +20,13 @@ public IDisposable ConfigureSteps(params int[] aSteps)
 		{
 			steps = new Step[aSteps.Length == 1 ? aSteps[0] : aSteps.Length];
 
-			return next.ConfigureSteps(aSteps);
+			next.ConfigureSteps(aSteps);
+
+			return new ActionDisposable(() =>
+			{
+				if (currentStep >= 0 && currentStep < steps.Length)
+					Finished();
+			});
 		}
 
 		public void StartStep(string stepName = null)
@@ -47,6 +53,8 @@ public void Finished()
 			next.Finished();
 
 			DumpTimes();
+
+			currentStep++;
 		}
 
 		private void OnFinishedStep()

csharp/ProgressMonitor/utils/ActionDisposable.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace org.pescuma.progressmonitor.utils
+{
+	internal class ActionDisposable : IDisposable
+	{
+		private readonly Action dispose;
+
+		public ActionDisposable(Action dispose)
+		{
+			this.dispose = dispose;
+		}
+
+		public void Dispose()
+		{
+			dispose();
+		}
+	}
+}

csharp/ProgressMonitor/utils/FlatToHierarchicalProgressMonitor.cs

@@ -228,20 +228,5 @@ public void ReportError(params string[] message)
 		{
 			flat.ReportError(message);
 		}
-
-		private class ActionDisposable : IDisposable
-		{
-			private readonly Action dispose;
-
-			public ActionDisposable(Action dispose)
-			{
-				this.dispose = dispose;
-			}
-
-			public void Dispose()
-			{
-				dispose();
-			}
-		}
 	}
 }