Merge remote-tracking branch 'upstream/master'

1 files changed, 13 insertions, 1 deletions

diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 2fc63039d..a05af246c 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -294,6 +294,7 @@ namespace MediaBrowser.Server.Implementations.Session
             session.PlayState.VolumeLevel = info.VolumeLevel;
             session.PlayState.AudioStreamIndex = info.AudioStreamIndex;
             session.PlayState.SubtitleStreamIndex = info.SubtitleStreamIndex;
+            session.PlayState.PlayMethod = info.PlayMethod;
         }
 
         /// <summary>
@@ -1253,8 +1254,8 @@ namespace MediaBrowser.Server.Implementations.Session
             }
 
             var backropItem = item.HasImage(ImageType.Backdrop) ? item : null;
-
             var thumbItem = item.HasImage(ImageType.Thumb) ? item : null;
+            var logoItem = item.HasImage(ImageType.Logo) ? item : null;
 
             if (thumbItem == null)
             {
@@ -1292,6 +1293,11 @@ namespace MediaBrowser.Server.Implementations.Session
                 thumbItem = item.Parents.FirstOrDefault(i => i.HasImage(ImageType.Thumb));
             }
 
+            if (logoItem == null)
+            {
+                logoItem = item.Parents.FirstOrDefault(i => i.HasImage(ImageType.Logo));
+            }
+
             if (thumbItem != null)
             {
                 info.ThumbImageTag = GetImageCacheTag(thumbItem, ImageType.Thumb);
@@ -1304,6 +1310,12 @@ namespace MediaBrowser.Server.Implementations.Session
                 info.BackdropItemId = GetDtoId(backropItem);
             }
 
+            if (logoItem != null)
+            {
+                info.LogoImageTag = GetImageCacheTag(logoItem, ImageType.Logo);
+                info.LogoItemId = GetDtoId(logoItem);
+            }
+
             return info;
         }