aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Connect/ConnectManager.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-01-26 15:40:15 -0500
committerGitHub <noreply@github.com>2017-01-26 15:40:15 -0500
commit1cd5e208713a057680b915c9136e0d4493611ed3 (patch)
tree59e258ecd246dfb253c06cade5f0092af9874774 /Emby.Server.Implementations/Connect/ConnectManager.cs
parent0d0e4ad695f3657d7ca3eef1ed54fe8608a490a1 (diff)
parent9ebf9162ab68fbf61a1dd5e7801eb9abe985762c (diff)
Merge pull request #2425 from MediaBrowser/beta
Beta
Diffstat (limited to 'Emby.Server.Implementations/Connect/ConnectManager.cs')
-rw-r--r--Emby.Server.Implementations/Connect/ConnectManager.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Connect/ConnectManager.cs b/Emby.Server.Implementations/Connect/ConnectManager.cs
index 8c8b7b0268..7e6755f6aa 100644
--- a/Emby.Server.Implementations/Connect/ConnectManager.cs
+++ b/Emby.Server.Implementations/Connect/ConnectManager.cs
@@ -925,7 +925,11 @@ namespace Emby.Server.Implementations.Connect
}
_data.PendingAuthorizations = newPendingList;
- CacheData();
+
+ if (!newPendingList.Select(i => i.Id).SequenceEqual(currentPendingList.Select(i => i.Id), StringComparer.Ordinal))
+ {
+ CacheData();
+ }
await RefreshGuestNames(list, refreshImages).ConfigureAwait(false);
}
@@ -1118,7 +1122,7 @@ namespace Emby.Server.Implementations.Connect
}
}
- public async Task Authenticate(string username, string passwordMd5)
+ public async Task<ConnectAuthenticationResult> Authenticate(string username, string passwordMd5)
{
if (string.IsNullOrWhiteSpace(username))
{
@@ -1147,6 +1151,7 @@ namespace Emby.Server.Implementations.Connect
// No need to examine the response
using (var response = (await _httpClient.SendAsync(options, "POST").ConfigureAwait(false)).Content)
{
+ return _json.DeserializeFromStream<ConnectAuthenticationResult>(response);
}
}