update translations

3 files changed, 17 insertions, 5 deletions

diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
index 9e69d08577..ef5c30975b 100644
--- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs
+++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
@@ -236,6 +236,11 @@ namespace MediaBrowser.Providers.Manager
         {
             try
             {
+                if (!item.SupportsRemoteImageDownloading)
+                {
+                    return;
+                }
+
                 if (!refreshOptions.ReplaceAllImages && 
                     refreshOptions.ReplaceImages.Count == 0 && 
                     ContainsImages(item, provider.GetSupportedImages(item).ToList(), savedOptions, backdropLimit, screenshotLimit))
diff --git a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
index d7615eb022..41c4dcb0de 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
@@ -1,5 +1,7 @@
-using MediaBrowser.Common.IO;
+using System.Linq;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
@@ -40,7 +42,11 @@ namespace MediaBrowser.Providers.Playlists
 
             if (mergeMetadataSettings)
             {
-                target.LinkedChildren = source.LinkedChildren;
+                var list = source.LinkedChildren.ToList();
+
+                list.AddRange(target.LinkedChildren);
+
+                target.LinkedChildren = list;
             }
         }
     }
diff --git a/MediaBrowser.Providers/TV/TvdbEpisodeImageProvider.cs b/MediaBrowser.Providers/TV/TvdbEpisodeImageProvider.cs
index ef37784501..d105174706 100644
--- a/MediaBrowser.Providers/TV/TvdbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TvdbEpisodeImageProvider.cs
@@ -188,9 +188,11 @@ namespace MediaBrowser.Providers.TV
 
         public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
         {
-            if (item.LocationType != LocationType.Virtual)
+            var episode = (Episode)item;
+            
+            if (!episode.IsVirtualUnaired)
             {
-                // For non-virtual items, only enable if configured
+                // For non-unaired items, only enable if configured
                 if (!_config.Configuration.EnableTvDbUpdates)
                 {
                     return false;
@@ -199,7 +201,6 @@ namespace MediaBrowser.Providers.TV
 
             if (!item.HasImage(ImageType.Primary))
             {
-                var episode = (Episode)item;
                 var series = episode.Series;
 
                 var seriesId = series != null ? series.GetProviderId(MetadataProviders.Tvdb) : null;