Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

1 files changed, 16 insertions, 6 deletions

diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index 91014ccdad..4696afeb62 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -15,10 +15,9 @@ namespace MediaBrowser.Controller.Entities.TV
     /// <summary>
     /// Class Series
     /// </summary>
-    public class Series : Folder, IHasSoundtracks, IHasTrailers, IHasDisplayOrder, IHasLookupInfo<SeriesInfo>, IHasSpecialFeatures, IMetadataContainer, IHasOriginalTitle
+    public class Series : Folder, IHasTrailers, IHasDisplayOrder, IHasLookupInfo<SeriesInfo>, IHasSpecialFeatures, IMetadataContainer, IHasOriginalTitle
     {
         public List<Guid> SpecialFeatureIds { get; set; }
-        public List<Guid> SoundtrackIds { get; set; }
 
         public string OriginalTitle { get; set; }
         public int SeasonCount { get; set; }
@@ -30,7 +29,6 @@ namespace MediaBrowser.Controller.Entities.TV
             AirDays = new List<DayOfWeek>();
 
             SpecialFeatureIds = new List<Guid>();
-            SoundtrackIds = new List<Guid>();
             RemoteTrailers = new List<MediaUrl>();
             LocalTrailerIds = new List<Guid>();
             RemoteTrailerIds = new List<Guid>();
@@ -63,7 +61,7 @@ namespace MediaBrowser.Controller.Entities.TV
         /// airdate, dvd or absolute
         /// </summary>
         public string DisplayOrder { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the status.
         /// </summary>
@@ -115,7 +113,19 @@ namespace MediaBrowser.Controller.Entities.TV
         /// <returns>System.String.</returns>
         protected override string CreateUserDataKey()
         {
-            return this.GetProviderId(MetadataProviders.Tvdb) ?? this.GetProviderId(MetadataProviders.Tvcom) ?? base.CreateUserDataKey();
+            var key = this.GetProviderId(MetadataProviders.Tvdb);
+
+            if (string.IsNullOrWhiteSpace(key))
+            {
+                key = this.GetProviderId(MetadataProviders.Imdb);
+            }
+
+            if (string.IsNullOrWhiteSpace(key))
+            {
+                key = base.CreateUserDataKey();
+            }
+
+            return key;
         }
 
         /// <summary>
@@ -190,7 +200,7 @@ namespace MediaBrowser.Controller.Entities.TV
         public IEnumerable<Episode> GetEpisodes(User user)
         {
             var config = user.Configuration;
-            
+
             return GetEpisodes(user, config.DisplayMissingEpisodes, config.DisplayUnairedEpisodes);
         }