Merge pull request #954 from MediaBrowser/dev

3.0.5462.0

1 files changed, 7 insertions, 3 deletions

diff --git a/MediaBrowser.Model/ApiClient/ServerCredentials.cs b/MediaBrowser.Model/ApiClient/ServerCredentials.cs
index 2490ba606..fbbc6c05d 100644
--- a/MediaBrowser.Model/ApiClient/ServerCredentials.cs
+++ b/MediaBrowser.Model/ApiClient/ServerCredentials.cs
@@ -50,10 +50,14 @@ namespace MediaBrowser.Model.ApiClient
                 {
                     existing.RemoteAddress = server.RemoteAddress;
                 }
-                if (!existing.IsLocalAddressFixed && !string.IsNullOrEmpty(server.LocalAddress))
+                if (!string.IsNullOrEmpty(server.LocalAddress))
                 {
                     existing.LocalAddress = server.LocalAddress;
                 }
+                if (!string.IsNullOrEmpty(server.ManualAddress))
+                {
+                    existing.LocalAddress = server.ManualAddress;
+                }
                 if (!string.IsNullOrEmpty(server.Name))
                 {
                     existing.Name = server.Name;
@@ -62,9 +66,9 @@ namespace MediaBrowser.Model.ApiClient
                 {
                     existing.WakeOnLanInfos = server.WakeOnLanInfos.ToList();
                 }
-                if (server.IsLocalAddressFixed)
+                if (server.LastConnectionMode.HasValue)
                 {
-                    existing.IsLocalAddressFixed = true;
+                    existing.LastConnectionMode = server.LastConnectionMode;
                 }
             }
             else