From e2e769d095b42906b3dc387b2a300213a8116281 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 24 May 2020 22:29:07 -0400 Subject: [PATCH] Fix DreamMaker progress task The task wasn't being cancelled correctly and was holding up the compile --- src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs index a10d0cb2ef..aab15c7d26 100644 --- a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs +++ b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs @@ -763,7 +763,7 @@ namespace Tgstation.Server.Host.Components.Deployment } using var progressCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); - var progressTask = estimatedDuration.HasValue ? ProgressTask(progressReporter, estimatedDuration.Value, cancellationToken) : Task.CompletedTask; + var progressTask = estimatedDuration.HasValue ? ProgressTask(progressReporter, estimatedDuration.Value, progressCts.Token) : Task.CompletedTask; try { using var byondLock = await byond.UseExecutables(null, cancellationToken).ConfigureAwait(false);