From 43e4cc0478d77894c0d8403101bbdd962b789f7f Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 7 Jun 2021 21:18:55 -0400 Subject: [PATCH] Handle whitespace control panel channels properly --- .../Controllers/ControlPanelController.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Tgstation.Server.Host/Controllers/ControlPanelController.cs b/src/Tgstation.Server.Host/Controllers/ControlPanelController.cs index 057d2afb2e..6daf1ca2d4 100644 --- a/src/Tgstation.Server.Host/Controllers/ControlPanelController.cs +++ b/src/Tgstation.Server.Host/Controllers/ControlPanelController.cs @@ -58,11 +58,13 @@ namespace Tgstation.Server.Host.Controllers var controlPanelChannel = controlPanelConfiguration.Channel; if (controlPanelChannel == "local") controlPanelChannel = ControlPanelRoute; - - controlPanelChannel = controlPanelChannel - ?.Replace("${Major}", ApiHeaders.Version.Major.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal) - ?.Replace("${Minor}", ApiHeaders.Version.Minor.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal) - ?.Replace("${Patch}", ApiHeaders.Version.Build.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal); + else if (String.IsNullOrWhiteSpace(controlPanelChannel)) + controlPanelChannel = null; + else + controlPanelChannel = controlPanelChannel + .Replace("${Major}", ApiHeaders.Version.Major.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal) + .Replace("${Minor}", ApiHeaders.Version.Minor.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal) + .Replace("${Patch}", ApiHeaders.Version.Build.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal); return Json(new {