From fcb256cc2a2f650778a9dd0786e9930990f6e602 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 8 May 2020 11:40:42 -0400 Subject: [PATCH] Fix reattaching --- .../Components/ReattachInfoHandler.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/ReattachInfoHandler.cs b/src/Tgstation.Server.Host/Components/ReattachInfoHandler.cs index a3f4a4f428..e78384e1c2 100644 --- a/src/Tgstation.Server.Host/Components/ReattachInfoHandler.cs +++ b/src/Tgstation.Server.Host/Components/ReattachInfoHandler.cs @@ -113,8 +113,12 @@ namespace Tgstation.Server.Host.Components return null; } - var bravoDmbTask = dmbFactory.FromCompileJob(result.Bravo.CompileJob, cancellationToken); - var info = new WatchdogReattachInformation(result, await dmbFactory.FromCompileJob(result.Alpha.CompileJob, cancellationToken).ConfigureAwait(false), await bravoDmbTask.ConfigureAwait(false)); + Task GetDmbForReattachInfo(Models.ReattachInformation reattachInformation) => reattachInformation != null + ? dmbFactory.FromCompileJob(reattachInformation.CompileJob, cancellationToken) + : Task.FromResult(null); + + var bravoDmbTask = GetDmbForReattachInfo(result.Bravo); + var info = new WatchdogReattachInformation(result, await GetDmbForReattachInfo(result.Alpha).ConfigureAwait(false), await bravoDmbTask.ConfigureAwait(false)); logger.LogDebug("Reattach information loaded: {0}", info); return info; }