cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 00:22:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix LaunchResult not completing if the process dies

Browse Source
This commit is contained in:
Jordan Brown
2020-08-04 13:18:39 -04:00
parent 715e2b014b
commit cd07e05e6e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Session/SessionController.cs
+1 -1
View File
@@ -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));