diff options
| author | Michalis Adamidis <gsnerf@gsnerf.de> | 2014-09-14 18:00:44 +0200 |
|---|---|---|
| committer | Michalis Adamidis <gsnerf@gsnerf.de> | 2014-09-14 18:00:44 +0200 |
| commit | 411a0531e0a71b2d458b5b3a8a9951ca763ca09a (patch) | |
| tree | 871614a2cab9da0aa95d1d1f9f350d80fcf56271 /MediaBrowser.Server.Implementations/Session | |
| parent | 4f3ea6c6c3cdde7f4b8d21dc97c711635d73b4e0 (diff) | |
| parent | 6a177d21478774b3ea1a5adc606935bb3aff65bf (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Server.Implementations/Session')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Session/SessionManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs index 912174c1e..ceda8f47d 100644 --- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs +++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs @@ -455,7 +455,7 @@ namespace MediaBrowser.Server.Implementations.Session users.Add(user); var additionalUsers = session.AdditionalUsers - .Select(i => _userManager.GetUserById(new Guid(i.UserId))) + .Select(i => _userManager.GetUserById(i.UserId)) .Where(i => i != null); users.AddRange(additionalUsers); @@ -1189,7 +1189,7 @@ namespace MediaBrowser.Server.Implementations.Session if (!string.IsNullOrWhiteSpace(info.UserId)) { - var user = _userManager.GetUserById(new Guid(info.UserId)); + var user = _userManager.GetUserById(info.UserId); if (user == null || user.Configuration.IsDisabled) { |