Skip to content

Usenet streaming with a WebDAV server and a SABnzbd-compatible API

C#

Fix bug during cleanup phase of concurrency-util.

nzbdav-dev52e3f31b79ed
diff --git a/backend/Extensions/IEnumerableTaskExtensions.cs b/backend/Extensions/IEnumerableTaskExtensions.cs
index 4a0dbfd2..0831d711 100644
--- a/backend/Extensions/IEnumerableTaskExtensions.cs
+++ b/backend/Extensions/IEnumerableTaskExtensions.cs
@@ -29,7 +29,6 @@ public static class IEnumerableTaskExtensions
var isFirst = true;
var runningTasks = new Queue<Task<T>>();
- Task<T>? completedTask = null;
try
{
foreach (var task in tasks)
@@ -44,24 +43,22 @@ public static class IEnumerableTaskExtensions
runningTasks.Enqueue(task);
if (runningTasks.Count < concurrency) continue;
- completedTask = runningTasks.Dequeue();
- yield return completedTask;
- completedTask = null;
+ yield return runningTasks.Dequeue();
}
while (runningTasks.Count > 0)
- {
- completedTask = runningTasks.Dequeue();
- yield return completedTask;
- completedTask = null;
- }
+ yield return runningTasks.Dequeue();
}
finally
{
- if (completedTask != null)
- _ = completedTask.ContinueWith(x => x.Result.Dispose());
while (runningTasks.Count > 0)
- _ = runningTasks.Dequeue().ContinueWith(x => x.Result.Dispose());
+ {
+ runningTasks.Dequeue().ContinueWith(x =>
+ {
+ if (x.Status == TaskStatus.RanToCompletion)
+ x.Result.Dispose();
+ });
+ }
}
}
}
\ No newline at end of file