From 7d410029bbc9724cf569f726391fce4da9e6fdca Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 10 Jul 2020 13:10:20 -0400 Subject: [PATCH] Handle a null return from FromCompileJob in SessionPersistor --- .../Components/Session/SessionPersistor.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs b/src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs index 30da71fa8c..eef018159e 100644 --- a/src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs +++ b/src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs @@ -153,9 +153,16 @@ namespace Tgstation.Server.Host.Components.Session return null; } + var dmb = await dmbFactory.FromCompileJob(result.CompileJob, cancellationToken).ConfigureAwait(false); + if (dmb == null) + { + logger.LogError("Unable to reattach! Could not load .dmb!"); + return null; + } + var info = new ReattachInformation( result, - await dmbFactory.FromCompileJob(result.CompileJob, cancellationToken).ConfigureAwait(false), + dmb, topicTimeout.Value); logger.LogDebug("Reattach information loaded: {0}", info);