Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Proper access to configuration objects

Browse Source
This commit is contained in:
Phlogi 2019-03-24 17:02:03 +01:00 committed by GitHub
parent 7ebb043249
commit 030fcaac15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Emby.Server.Implementations/ApplicationHost.cs
View File

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