From 3a4cd01b136e31bbdaaca293f84589852ad934e9 Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Thu, 2 Apr 2020 18:04:49 +0200 Subject: [PATCH] Merge pull request #2740 from JustAMan/fix-livetv Fix GetLocalApiUrl for cases with https enabled (cherry picked from commit b3283e37f2ec1ee106bc135502f37f96f32954be) Signed-off-by: Joshua M. Boniface --- Emby.Server.Implementations/ApplicationHost.cs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 6999972024..be4e343b40 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -1517,18 +1517,10 @@ namespace Emby.Server.Implementations public string GetLocalApiUrl(ReadOnlySpan host) { var url = new StringBuilder(64); - if (EnableHttps) - { - url.Append("https://"); - } - else - { - url.Append("http://"); - } - - url.Append(host) + url.Append(EnableHttps ? "https://" : "http://") + .Append(host) .Append(':') - .Append(HttpPort); + .Append(EnableHttps ? HttpsPort : HttpPort); string baseUrl = ServerConfigurationManager.Configuration.BaseUrl; if (baseUrl.Length != 0)