mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04: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)
|
private void ClearImages(IHasImages item, ImageType type)
|
||||||
{
|
{
|
||||||
var deleted = false;
|
var deleted = false;
|
||||||
var deletedImages = new List<ItemImageInfo>();
|
|
||||||
|
|
||||||
foreach (var image in item.GetImages(type).ToList())
|
foreach (var image in item.GetImages(type).ToList())
|
||||||
{
|
{
|
||||||
if (!image.IsLocalFile)
|
if (!image.IsLocalFile)
|
||||||
{
|
{
|
||||||
deletedImages.Add(image);
|
// TODO: Need to get this image removed
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -385,11 +384,6 @@ namespace MediaBrowser.Providers.Manager
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var image in deletedImages)
|
|
||||||
{
|
|
||||||
item.RemoveImage(image);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (deleted)
|
if (deleted)
|
||||||
{
|
{
|
||||||
item.ValidateImages(new DirectoryService(_logger, _fileSystem));
|
item.ValidateImages(new DirectoryService(_logger, _fileSystem));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user