diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-05-23 00:51:57 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-05-23 00:51:57 -0400 |
| commit | 6a2fef8b262689bb7b2ef56e22b89521bd3f427f (patch) | |
| tree | 6fc7491ed9f2c7b7a6e4166ec9061b067ceb8fd3 /MediaBrowser.Model/ApiClient/ServerCredentials.cs | |
| parent | af7b6e6fce61aef55d43d15081fda0c5f49be113 (diff) | |
| parent | 8dcee1f356c2a568df4f3d51889c01fc42fa507a (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'MediaBrowser.Model/ApiClient/ServerCredentials.cs')
| -rw-r--r-- | MediaBrowser.Model/ApiClient/ServerCredentials.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/MediaBrowser.Model/ApiClient/ServerCredentials.cs b/MediaBrowser.Model/ApiClient/ServerCredentials.cs index 0f0ab65d4..19f68445e 100644 --- a/MediaBrowser.Model/ApiClient/ServerCredentials.cs +++ b/MediaBrowser.Model/ApiClient/ServerCredentials.cs @@ -57,6 +57,10 @@ namespace MediaBrowser.Model.ApiClient { existing.RemoteAddress = server.RemoteAddress; } + if (!string.IsNullOrEmpty(server.ConnectServerId)) + { + existing.ConnectServerId = server.ConnectServerId; + } if (!string.IsNullOrEmpty(server.LocalAddress)) { existing.LocalAddress = server.LocalAddress; |