diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-02-19 21:07:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 21:07:09 +0100 |
| commit | 0f173e1778577f11d86da38ff2174ac1f0e7d612 (patch) | |
| tree | 20812a41d73520d58efe2a69f9b2b52b022c980d /MediaBrowser.Controller/Session | |
| parent | cefac4f886e82a642380586b3d732e729cd76dd1 (diff) | |
| parent | cef796a5ba6dd256f425fb87c13d63c724499058 (diff) | |
Merge branch 'master' into sessionmanager
Diffstat (limited to 'MediaBrowser.Controller/Session')
| -rw-r--r-- | MediaBrowser.Controller/Session/SessionInfo.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs index 6e8385cf8..f1f10a3a3 100644 --- a/MediaBrowser.Controller/Session/SessionInfo.cs +++ b/MediaBrowser.Controller/Session/SessionInfo.cs @@ -107,6 +107,8 @@ namespace MediaBrowser.Controller.Session public BaseItem FullNowPlayingItem { get; set; } + public BaseItemDto NowViewingItem { get; set; } + /// <summary> /// Gets or sets the device id. /// </summary> @@ -239,11 +241,6 @@ namespace MediaBrowser.Controller.Session SessionControllers = controllers.ToArray(); } - public bool ContainsUser(string userId) - { - return ContainsUser(new Guid(userId)); - } - public bool ContainsUser(Guid userId) { if (UserId.Equals(userId)) |