open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix check for available WAN address.

Browse Source
pull/1151/head
Phlogi 6 years ago committed by GitHub
parent fb7f29de18
commit 087d4153ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File

16
Emby.Server.Implementations/ApplicationHost.cs
Unescape View File

@ -1372,10 +1372,13 @@ namespace Emby.Server.Implementations
public async Task<SystemInfo> GetSystemInfo(CancellationToken cancellationToken)
{
var localAddress = await GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
var wanAddress = GetWanApiUrl(ServerConfigurationManager.Configuration.WanDdns);
var wanAddress = System.String.Empty;
if (string.IsNullOrEmpty(wanAddress)){
if (string.IsNullOrEmpty(ServerConfigurationManager.Configuration.WanDdns)){
wanAddress = await GetWanApiUrl(cancellationToken).ConfigureAwait(false);
} else
{
wanAddress = GetWanApiUrl(ServerConfigurationManager.Configuration.WanDdns);
}
return new SystemInfo
@ -1425,11 +1428,14 @@ namespace Emby.Server.Implementations
public async Task<PublicSystemInfo> GetPublicSystemInfo(CancellationToken cancellationToken)
{
var localAddress = await GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
var wanAddress = GetWanApiUrl(ServerConfigurationManager.Configuration.WanDdns);
var localAddress = await GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
var wanAddress = System.String.Empty;
if (string.IsNullOrEmpty(wanAddress)){
if (string.IsNullOrEmpty(ServerConfigurationManager.Configuration.WanDdns)){
wanAddress = await GetWanApiUrl(cancellationToken).ConfigureAwait(false);
} else
{
wanAddress = GetWanApiUrl(ServerConfigurationManager.Configuration.WanDdns);
}
return new PublicSystemInfo
{

Write Preview
Loading…
Cancel
Save