From 45f0b9932f6bbe36e6156ffbabf3dd3197bdcba1 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Wed, 8 Aug 2018 15:33:36 -0400
Subject: [PATCH] Fix instance manager

---
 src/Tgstation.Server.Host/Components/InstanceFactory.cs | 2 +-
 src/Tgstation.Server.Host/Components/InstanceManager.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/InstanceFactory.cs b/src/Tgstation.Server.Host/Components/InstanceFactory.cs
index e5b48d68b2..6cc7e61b51 100644
--- a/src/Tgstation.Server.Host/Components/InstanceFactory.cs
+++ b/src/Tgstation.Server.Host/Components/InstanceFactory.cs
@@ -152,7 +152,7 @@ namespace Tgstation.Server.Host.Components
 						commandFactory.SetWatchdog(watchdog);
 						try
 						{
-							var dreamMaker = new DreamMaker(byond, gameIoManager, configuration, sessionControllerFactory, dmbFactory, application, eventConsumer, loggerFactory.CreateLogger<DreamMaker>());
+							var dreamMaker = new DreamMaker(byond, gameIoManager, configuration, sessionControllerFactory, dmbFactory, application, eventConsumer, chat, loggerFactory.CreateLogger<DreamMaker>());
 
 							return new Instance(metadata.CloneMetadata(), repoManager, byond, dreamMaker, watchdog, chat, configuration, dmbFactory, databaseContextFactory, dmbFactory, loggerFactory.CreateLogger<Instance>());
 						}
diff --git a/src/Tgstation.Server.Host/Components/InstanceManager.cs b/src/Tgstation.Server.Host/Components/InstanceManager.cs
index ef7fa6019c..55ac6a288c 100644
--- a/src/Tgstation.Server.Host/Components/InstanceManager.cs
+++ b/src/Tgstation.Server.Host/Components/InstanceManager.cs
@@ -86,6 +86,7 @@ namespace Tgstation.Server.Host.Components
 			if (serverControl == null)
 				throw new ArgumentNullException(nameof(serverControl));
 
+			shutdownCancellationTokenSource = new CancellationTokenSource();
 			var cancellationToken = shutdownCancellationTokenSource.Token;
 			serverControl.RegisterForRestart(() =>
 			{
@@ -98,7 +99,6 @@ namespace Tgstation.Server.Host.Components
 			instances = new Dictionary<long, IInstance>();
 			interopConsumers = new Dictionary<string, IInteropConsumer>();
 			shutdownTasks = new List<Task>();
-			shutdownCancellationTokenSource = new CancellationTokenSource();
 		}
 
 		/// <inheritdoc />