3.0.5231.40980

This commit is contained in:
Luke Pulverenti
2014-04-28 23:56:20 -04:00
parent 0f4c28c120
commit e9fb806478
38 changed files with 1197 additions and 372 deletions

View File

@@ -264,7 +264,7 @@ namespace MediaBrowser.Server.Implementations.Session
/// <param name="libraryItem">The library item.</param>
private void UpdateNowPlayingItem(SessionInfo session, PlaybackProgressInfo info, BaseItem libraryItem)
{
var runtimeTicks = libraryItem.RunTimeTicks;
var runtimeTicks = libraryItem == null ? null : libraryItem.RunTimeTicks;
if (string.IsNullOrWhiteSpace(info.MediaSourceId))
{
@@ -277,7 +277,7 @@ namespace MediaBrowser.Server.Implementations.Session
runtimeTicks = _libraryManager.GetItemById(new Guid(info.MediaSourceId)).RunTimeTicks;
}
if (!string.IsNullOrWhiteSpace(info.ItemId))
if (!string.IsNullOrWhiteSpace(info.ItemId) && libraryItem != null)
{
info.Item = GetItemInfo(libraryItem, runtimeTicks);
}