Proper access to configuration objects

pull/1151/head
Phlogi 6 years ago committed by GitHub
parent 7ebb043249
commit 030fcaac15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1372,11 +1372,10 @@ namespace Emby.Server.Implementations
public async Task<SystemInfo> GetSystemInfo(CancellationToken cancellationToken)
{
var localAddress = await GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
var wanAddress = ServerConfigurationManager.Configuration.WanDdns;
if (string.IsNullOrEmpty(ServerConfiguration.WanDdns)){
if (string.IsNullOrEmpty(wanAddress)){
var wanAddress = await GetWanApiUrl(cancellationToken).ConfigureAwait(false);
} else {
var wanAddress = ServerConfiguration.WanDdns;
}
return new SystemInfo
@ -1530,11 +1529,11 @@ namespace Emby.Server.Implementations
{
return string.Format("https://{0}:{1}",
host,
ServerConfiguration.PublicHttpsPort.ToString(CultureInfo.InvariantCulture));
ServerConfigurationManager.Configuration.PublicHttpsPort.ToString(CultureInfo.InvariantCulture));
}
return string.Format("http://{0}:{1}",
host,
ServerConfiguration.PublicPort.ToString(CultureInfo.InvariantCulture));
ServerConfigurationManager.Configuration.PublicPort.ToString(CultureInfo.InvariantCulture));
}
public Task<List<IpAddressInfo>> GetLocalIpAddresses(CancellationToken cancellationToken)

Loading…
Cancel
Save