Merge pull request #2796 from MediaBrowser/dev

Dev

2 files changed, 9 insertions, 11 deletions

diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index edca5e7d68..01aee9b92e 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -302,13 +302,6 @@ namespace MediaBrowser.Providers.Manager
                 updateType |= ItemUpdateType.MetadataImport;
             }
 
-            var inheritedTags = item.GetInheritedTags();
-            if (!inheritedTags.SequenceEqual(item.InheritedTags, StringComparer.Ordinal))
-            {
-                item.InheritedTags = inheritedTags;
-                updateType |= ItemUpdateType.MetadataImport;
-            }
-
             return updateType;
         }
 
diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs
index ff266f4c12..93a386ed59 100644
--- a/MediaBrowser.Providers/Manager/ProviderUtils.cs
+++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs
@@ -204,12 +204,17 @@ namespace MediaBrowser.Providers.Manager
 
             //if (!lockedFields.Contains(MetadataFields.DisplayMediaType))
             {
-                if (replaceData || string.IsNullOrEmpty(target.DisplayMediaType))
+                var targetVideo = target as Video;
+                var sourceVideo = source as Video;
+                if (sourceVideo != null && targetVideo != null)
                 {
-                    // Safeguard against incoming data having an emtpy name
-                    if (!string.IsNullOrWhiteSpace(source.DisplayMediaType))
+                    if (replaceData || string.IsNullOrEmpty(targetVideo.DisplayMediaType))
                     {
-                        target.DisplayMediaType = source.DisplayMediaType;
+                        // Safeguard against incoming data having an emtpy name
+                        if (!string.IsNullOrWhiteSpace(sourceVideo.DisplayMediaType))
+                        {
+                            targetVideo.DisplayMediaType = sourceVideo.DisplayMediaType;
+                        }
                     }
                 }
             }