From 4199f8ea01c9175dfcfe122ff59404ba560a62ed Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 24 Jun 2020 15:54:27 -0400 Subject: [PATCH] Fix hard restarts triggering launch chat message --- .../Components/Watchdog/WatchdogBase.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs index f95eb8111b..6c41a43985 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs @@ -860,14 +860,15 @@ namespace Tgstation.Server.Host.Components.Watchdog if (!graceful) { Task chatTask; - if (Running) + bool hard = Running; + if (hard) { chatTask = Chat.SendWatchdogMessage("Manual restart triggered...", false, cancellationToken); await TerminateNoLock(false, false, cancellationToken).ConfigureAwait(false); } else chatTask = Task.CompletedTask; - await LaunchNoLock(true, !Running, null, cancellationToken).ConfigureAwait(false); + await LaunchNoLock(true, !hard, null, cancellationToken).ConfigureAwait(false); await chatTask.ConfigureAwait(false); }