From 1b06e05cf69815e523faaf9e237461fe0541c7ce Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 14 Nov 2014 01:27:10 -0500
Subject: update translations

---
 MediaBrowser.Model/ApiClient/ServerCredentials.cs | 6 +++++-
 MediaBrowser.Model/ApiClient/ServerInfo.cs        | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Model/ApiClient')

diff --git a/MediaBrowser.Model/ApiClient/ServerCredentials.cs b/MediaBrowser.Model/ApiClient/ServerCredentials.cs
index 56bf5cc18..2490ba606 100644
--- a/MediaBrowser.Model/ApiClient/ServerCredentials.cs
+++ b/MediaBrowser.Model/ApiClient/ServerCredentials.cs
@@ -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
             {
diff --git a/MediaBrowser.Model/ApiClient/ServerInfo.cs b/MediaBrowser.Model/ApiClient/ServerInfo.cs
index 0570647e9..95cdf006b 100644
--- a/MediaBrowser.Model/ApiClient/ServerInfo.cs
+++ b/MediaBrowser.Model/ApiClient/ServerInfo.cs
@@ -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
                 }
             }
         }
-
     }
 }
-- 
cgit v1.2.3