diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-02 18:42:39 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-02 18:42:39 -0500 |
| commit | 5e3b9e80ad4a9bc47682203991edc77ac20f324b (patch) | |
| tree | 8577654f9761e1bdba752a1bfa42a2a2448d1f67 | |
| parent | a8c482ba7e6bbc2b579cd4125b5110f1df741dac (diff) | |
fix merge conflicts
| -rw-r--r-- | MediaBrowser.Providers/Manager/ItemImageProvider.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs index f99aa967fb..19f575d0d6 100644 --- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs +++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs @@ -359,13 +359,12 @@ namespace MediaBrowser.Providers.Manager private void ClearImages(IHasImages item, ImageType type) { var deleted = false; - var deletedImages = new List<ItemImageInfo>(); foreach (var image in item.GetImages(type).ToList()) { if (!image.IsLocalFile) { - deletedImages.Add(image); + // TODO: Need to get this image removed continue; } @@ -385,11 +384,6 @@ namespace MediaBrowser.Providers.Manager } } - foreach (var image in deletedImages) - { - item.RemoveImage(image); - } - if (deleted) { item.ValidateImages(new DirectoryService(_logger, _fileSystem)); |
