From 4d1e1898ceaa2d6eab36599dbe3144d6128d47f3 Mon Sep 17 00:00:00 2001 From: Dominion Date: Fri, 26 May 2023 15:57:48 -0400 Subject: [PATCH] Fixed topic retries not aborting unless a reboot AND process termination occurred --- .../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 7103763c9e..ec67f72e55 100644 --- a/src/Tgstation.Server.Host/Components/Session/SessionController.cs +++ b/src/Tgstation.Server.Host/Components/Session/SessionController.cs @@ -898,7 +898,7 @@ namespace Tgstation.Server.Host.Components.Session async Task SendRawTopic(string queryString, bool priority, CancellationToken cancellationToken) { var targetPort = ReattachInformation.Port; - var killedOrRebootedTask = Task.WhenAll(Lifetime, OnReboot); + var killedOrRebootedTask = Task.WhenAny(Lifetime, OnReboot); global::Byond.TopicSender.TopicResponse byondResponse = null; var firstSend = true; for (var i = 4; i >= 0 && (priority || firstSend); --i)