lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1062 from MediaBrowser/master

Browse Source 
fix hasMediaSources exception
This commit is contained in:
Luke 2015-04-02 12:30:39 -04:00
commit c5e86f0db7
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MediaBrowser.Server.Implementations/Session/SessionManager.cs
View File

@ -305,7 +305,7 @@ namespace MediaBrowser.Server.Implementations.Session
} }
} }
private async Task<MediaSourceInfo> GetMediaSource(BaseItem item, string mediaSourceId) private async Task<MediaSourceInfo> GetMediaSource(IHasMediaSources item, string mediaSourceId)
{ {
var sources = await _mediaSourceManager.GetPlayackMediaSources(item.Id.ToString("N"), false, CancellationToken.None) var sources = await _mediaSourceManager.GetPlayackMediaSources(item.Id.ToString("N"), false, CancellationToken.None)
.ConfigureAwait(false); .ConfigureAwait(false);
@ -334,12 +334,17 @@ namespace MediaBrowser.Server.Implementations.Session
{ {
var runtimeTicks = libraryItem.RunTimeTicks; var runtimeTicks = libraryItem.RunTimeTicks;
var mediaSource = await GetMediaSource(libraryItem, info.MediaSourceId).ConfigureAwait(false); MediaSourceInfo mediaSource = null;
var hasMediaSources = libraryItem as IHasMediaSources;
if (hasMediaSources != null)
{
mediaSource = await GetMediaSource(hasMediaSources, info.MediaSourceId).ConfigureAwait(false);
if (mediaSource != null) if (mediaSource != null)
{ {
runtimeTicks = mediaSource.RunTimeTicks; runtimeTicks = mediaSource.RunTimeTicks;
} }
}
info.Item = GetItemInfo(libraryItem, libraryItem, mediaSource); info.Item = GetItemInfo(libraryItem, libraryItem, mediaSource);
@ -756,7 +761,13 @@ namespace MediaBrowser.Server.Implementations.Session
if (current == null || !string.Equals(current.Id, info.ItemId, StringComparison.OrdinalIgnoreCase)) if (current == null || !string.Equals(current.Id, info.ItemId, StringComparison.OrdinalIgnoreCase))
{ {
var mediaSource = await GetMediaSource(libraryItem, info.MediaSourceId).ConfigureAwait(false); MediaSourceInfo mediaSource = null;
var hasMediaSources = libraryItem as IHasMediaSources;
if (hasMediaSources != null)
{
mediaSource = await GetMediaSource(hasMediaSources, info.MediaSourceId).ConfigureAwait(false);
}
info.Item = GetItemInfo(libraryItem, libraryItem, mediaSource); info.Item = GetItemInfo(libraryItem, libraryItem, mediaSource);
} }