From cd07e05e6e0a96d12c076f57da693ebcf2258697 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Tue, 4 Aug 2020 13:18:39 -0400
Subject: [PATCH] Fix LaunchResult not completing if the process dies

---
 .../Components/Session/SessionController.cs                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tgstation.Server.Host/Components/Session/SessionController.cs b/src/Tgstation.Server.Host/Components/Session/SessionController.cs
index a5f6a8ca45..79b17c930b 100644
--- a/src/Tgstation.Server.Host/Components/Session/SessionController.cs
+++ b/src/Tgstation.Server.Host/Components/Session/SessionController.cs
@@ -304,7 +304,7 @@ namespace Tgstation.Server.Host.Components.Session
 			var startupTask = !reattached && (apiValidate || DMApiAvailable)
 				? initialBridgeRequestTcs.Task
 				: process.Startup;
-			var toAwait = startupTask;
+			var toAwait = Task.WhenAny(startupTask, process.Lifetime);
 
 			if (startupTimeout.HasValue)
 				toAwait = Task.WhenAny(toAwait, Task.Delay(startTime.AddSeconds(startupTimeout.Value) - startTime));