added IsMuted to playback progress

2 files changed, 14 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index a75dc47e1d..3c8c2411ec 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1211,7 +1211,7 @@ namespace MediaBrowser.Controller.Entities
             else
             {
                 // Check for dupes based on the combination of Name and Type
-                if (!People.Any(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && p.Type.Equals(person.Type, StringComparison.OrdinalIgnoreCase)))
+                if (!People.Any(p => string.Equals(p.Name, person.Name, StringComparison.OrdinalIgnoreCase) && string.Equals(p.Type, person.Type, StringComparison.OrdinalIgnoreCase)))
                 {
                     People.Add(person);
                 }
diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.cs
index ed20d05b04..044de3d6b5 100644
--- a/MediaBrowser.Controller/Entities/Trailer.cs
+++ b/MediaBrowser.Controller/Entities/Trailer.cs
@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -47,5 +48,17 @@ namespace MediaBrowser.Controller.Entities
         {
             get { return !IsLocalTrailer; }
         }
+
+        public override string GetUserDataKey()
+        {
+            var key = this.GetProviderId(MetadataProviders.Tmdb) ?? this.GetProviderId(MetadataProviders.Tvdb) ?? this.GetProviderId(MetadataProviders.Imdb) ?? this.GetProviderId(MetadataProviders.Tvcom);
+
+            if (!string.IsNullOrWhiteSpace(key))
+            {
+                return key + "-trailer";
+            }
+
+            return base.GetUserDataKey();
+        }
     }
 }