From 0e02e0559d3873a35ca2ec911b3c0b714a7611ea Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 16 Jan 2015 23:29:53 -0500
Subject: sync updates

---
 .../Session/SessionManager.cs                          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Session')

diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 8bf39fd6b..7112c2357 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -307,21 +307,21 @@ namespace MediaBrowser.Server.Implementations.Session
         /// <param name="libraryItem">The library item.</param>
         private void UpdateNowPlayingItem(SessionInfo session, PlaybackProgressInfo info, BaseItem libraryItem)
         {
-            var runtimeTicks = libraryItem == null ? null : libraryItem.RunTimeTicks;
-
             if (string.IsNullOrWhiteSpace(info.MediaSourceId))
             {
                 info.MediaSourceId = info.ItemId;
             }
 
-            if (!string.Equals(info.ItemId, info.MediaSourceId) &&
-                !string.IsNullOrWhiteSpace(info.MediaSourceId))
+            if (!string.IsNullOrWhiteSpace(info.ItemId) && info.Item == null && libraryItem != null)
             {
-                runtimeTicks = _libraryManager.GetItemById(new Guid(info.MediaSourceId)).RunTimeTicks;
-            }
+                var runtimeTicks = libraryItem.RunTimeTicks;
+
+                if (!string.Equals(info.ItemId, info.MediaSourceId) &&
+                    !string.IsNullOrWhiteSpace(info.MediaSourceId))
+                {
+                    runtimeTicks = _libraryManager.GetItemById(new Guid(info.MediaSourceId)).RunTimeTicks;
+                }
 
-            if (!string.IsNullOrWhiteSpace(info.ItemId) && libraryItem != null)
-            {
                 var current = session.NowPlayingItem;
 
                 if (current == null || !string.Equals(current.Id, info.ItemId, StringComparison.OrdinalIgnoreCase))
@@ -711,7 +711,7 @@ namespace MediaBrowser.Server.Implementations.Session
                 info.MediaSourceId = info.ItemId;
             }
 
-            if (!string.IsNullOrWhiteSpace(info.ItemId) && libraryItem != null)
+            if (!string.IsNullOrWhiteSpace(info.ItemId) && info.Item == null && libraryItem != null)
             {
                 var current = session.NowPlayingItem;
 
-- 
cgit v1.2.3