diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2018-12-30 01:04:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-30 01:04:27 -0500 |
| commit | 76b647e0a8eddd65dc9c4de7b887a3faf6e12bcc (patch) | |
| tree | a0fcc6a59c597f7c288dd3619c7e72bf97d2e0ea /Emby.Server.Implementations/EntryPoints | |
| parent | a86b71899ec52c44ddc6c3018e8cc5e9d7ff4d62 (diff) | |
| parent | d10d632c489b94566bbcf1b7e9c2bb86c31c97b1 (diff) | |
Merge pull request #325 from jellyfin/devv3.5.2-5
Master 3.5.2-5
Diffstat (limited to 'Emby.Server.Implementations/EntryPoints')
| -rw-r--r-- | Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs | 5 | ||||
| -rw-r--r-- | Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs index 6801b2823..aa672a1b7 100644 --- a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs +++ b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs @@ -12,7 +12,6 @@ using MediaBrowser.Model.Events; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Threading; using Mono.Nat; -using MediaBrowser.Model.Extensions; using System.Threading; namespace Emby.Server.Implementations.EntryPoints @@ -59,7 +58,7 @@ namespace Emby.Server.Implementations.EntryPoints values.Add(_appHost.EnableHttps.ToString()); values.Add((config.EnableRemoteAccess).ToString()); - return string.Join("|", values.ToArray(values.Count)); + return string.Join("|", values.ToArray()); } void _config_ConfigurationUpdated(object sender, EventArgs e) @@ -316,4 +315,4 @@ namespace Emby.Server.Implementations.EntryPoints } } } -}
\ No newline at end of file +} diff --git a/Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs index 97feb32c0..450764040 100644 --- a/Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs +++ b/Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs @@ -58,7 +58,7 @@ namespace Emby.Server.Implementations.EntryPoints session.ApplicationVersion }; - var key = string.Join("_", keys.ToArray(keys.Count)).GetMD5(); + var key = string.Join("_", keys.ToArray()).GetMD5(); ClientInfo info; if (!_apps.TryGetValue(key, out info)) |