alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-04 17:26:19 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

update translations

Browse Source
This commit is contained in:
Luke Pulverenti
2014-11-14 01:27:10 -05:00
parent 4f5c768704
commit 1b06e05cf6
81 changed files with 694 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Model/ApiClient/ServerCredentials.cs
View File

@@ -50,7 +50,7 @@ namespace MediaBrowser.Model.ApiClient
{
existing.RemoteAddress = server.RemoteAddress;
}
if (!string.IsNullOrEmpty(server.LocalAddress))
if (!existing.IsLocalAddressFixed && !string.IsNullOrEmpty(server.LocalAddress))
{
existing.LocalAddress = server.LocalAddress;
}
@@ -62,6 +62,10 @@ namespace MediaBrowser.Model.ApiClient
{
existing.WakeOnLanInfos = server.WakeOnLanInfos.ToList();
}
if (server.IsLocalAddressFixed)
{
existing.IsLocalAddressFixed = true;
}
}
else
{

6
MediaBrowser.Model/ApiClient/ServerInfo.cs
View File

@@ -18,6 +18,8 @@ namespace MediaBrowser.Model.ApiClient
public String ExchangeToken { get; set; }
public UserLinkType? UserLinkType { get; set; }
public bool IsLocalAddressFixed { get; set; }
public ServerInfo()
{
WakeOnLanInfos = new List<WakeOnLanInfo>();
@@ -28,10 +30,11 @@ namespace MediaBrowser.Model.ApiClient
Name = systemInfo.ServerName;
Id = systemInfo.Id;
if (!string.IsNullOrEmpty(systemInfo.LocalAddress))
if (!IsLocalAddressFixed && !string.IsNullOrEmpty(systemInfo.LocalAddress))
{
LocalAddress = systemInfo.LocalAddress;
}
if (!string.IsNullOrEmpty(systemInfo.WanAddress))
{
RemoteAddress = systemInfo.WanAddress;
@@ -52,6 +55,5 @@ namespace MediaBrowser.Model.ApiClient
}
}
}
}
}