From e4df4cfd09acbe4eace9eb2bd4a1686616ccb1f4 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sun, 5 Jan 2020 12:17:40 -0500
Subject: [PATCH] Prevent sending interop to finished session controllers.

---
 .../Components/Watchdog/SessionController.cs             | 9 +++++++++
 .../Components/Watchdog/WatchdogBase.cs                  | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs b/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs
index a0ca37eb8d..7f62840d90 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/SessionController.cs
@@ -447,6 +447,15 @@ namespace Tgstation.Server.Host.Components.Watchdog
 
 		async Task<string> SendCommand(string command, ushort? overridePort, CancellationToken cancellationToken)
 		{
+			if (Lifetime.IsCompleted)
+			{
+				logger.LogWarning(
+					"Attempted to send a command to an inactive SessionController{1}: {0}",
+					command,
+					overridePort.HasValue ? $" (Override port: {overridePort.Value})" : String.Empty);
+				return null;
+			}
+
 			try
 			{
 				var commandString = String.Format(CultureInfo.InvariantCulture,
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
index 336021687c..8b962e9936 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
@@ -426,6 +426,9 @@ namespace Tgstation.Server.Host.Components.Watchdog
 		/// <inheritdoc />
 		public async Task<bool> HandleEvent(EventType eventType, IEnumerable<string> parameters, CancellationToken cancellationToken)
 		{
+			if (!Running)
+				return true;
+
 			string results;
 			using (await SemaphoreSlimContext.Lock(Semaphore, cancellationToken).ConfigureAwait(false))
 			{