Merge pull request #2740 from JustAMan/fix-livetv

Fix GetLocalApiUrl for cases with https enabled
This commit is contained in:
Bond-009 2020-04-02 18:04:49 +02:00 committed by GitHub
commit b3283e37f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1509,18 +1509,10 @@ namespace Emby.Server.Implementations
public string GetLocalApiUrl(ReadOnlySpan<char> host) public string GetLocalApiUrl(ReadOnlySpan<char> host)
{ {
var url = new StringBuilder(64); var url = new StringBuilder(64);
if (EnableHttps) url.Append(EnableHttps ? "https://" : "http://")
{ .Append(host)
url.Append("https://");
}
else
{
url.Append("http://");
}
url.Append(host)
.Append(':') .Append(':')
.Append(HttpPort); .Append(EnableHttps ? HttpsPort : HttpPort);
string baseUrl = ServerConfigurationManager.Configuration.BaseUrl; string baseUrl = ServerConfigurationManager.Configuration.BaseUrl;
if (baseUrl.Length != 0) if (baseUrl.Length != 0)