mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-09 23:30:50 +02:00
fix merge conflicts
This commit is contained in:
parent
a8c482ba7e
commit
5e3b9e80ad
|
@ -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));
|
||||
|
|
Loading…
Reference in a new issue