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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Jordan Brown
2020-12-22 19:41:27 -05:00
parent 61d504a9e4 76e6d35f6a
commit 0853bb13d7
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/Controllers/DreamDaemonController.cs
+1 -1
View File
@@ -283,7 +283,7 @@ namespace Tgstation.Server.Host.Controllers
// run this second because current may be modified by it
await watchdog.ChangeSettings(current, cancellationToken).ConfigureAwait(false);
if (!oldSoftRestart && model.SoftRestart == true)
if (!oldSoftRestart && model.SoftRestart == true && watchdog.Status == WatchdogStatus.Online)
await watchdog.Restart(true, cancellationToken).ConfigureAwait(false);
else if (!oldSoftShutdown && model.SoftShutdown == true)
await watchdog.Terminate(true, cancellationToken).ConfigureAwait(false);