diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-09-09 20:28:59 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-09-09 20:28:59 -0400 |
| commit | b314199319c599996090282d79baddcde413a187 (patch) | |
| tree | 26760a6d449ecfc7b81e9b3ca4a5cb24a6f00223 /MediaBrowser.Server.Implementations/Connect/ConnectManager.cs | |
| parent | a2dc5e090bac15ee2dd7c83281aa9fada1f74734 (diff) | |
resolve wtv transcoding
Diffstat (limited to 'MediaBrowser.Server.Implementations/Connect/ConnectManager.cs')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Connect/ConnectManager.cs | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index 8c0a14366..f1dfae934 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -31,8 +31,23 @@ namespace MediaBrowser.Server.Implementations.Connect public string ConnectServerId { get; set; } public string ConnectAccessKey { get; set; } - public string WanIpAddress { get; private set; } + public string DiscoveredWanIpAddress { get; private set; } + public string WanIpAddress + { + get + { + var address = _config.Configuration.WanDdns; + + if (string.IsNullOrWhiteSpace(address)) + { + address = DiscoveredWanIpAddress; + } + + return address; + } + } + public string WanApiAddress { get @@ -75,7 +90,7 @@ namespace MediaBrowser.Server.Implementations.Connect internal void OnWanAddressResolved(string address) { - WanIpAddress = address; + DiscoveredWanIpAddress = address; //UpdateConnectInfo(); } |
