mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 03:48:06 +02:00
Merge pull request #4706 from cvium/fix_aspectratio_again
Only apply series image aspect ratio if episode/season has no primary image
This commit is contained in:
commit
0d5f651ae9
1 changed files with 8 additions and 2 deletions
|
@ -1138,9 +1138,12 @@ namespace Emby.Server.Implementations.Dto
|
||||||
if (episodeSeries != null)
|
if (episodeSeries != null)
|
||||||
{
|
{
|
||||||
dto.SeriesPrimaryImageTag = GetTagAndFillBlurhash(dto, episodeSeries, ImageType.Primary);
|
dto.SeriesPrimaryImageTag = GetTagAndFillBlurhash(dto, episodeSeries, ImageType.Primary);
|
||||||
|
if (!dto.ImageTags.ContainsKey(ImageType.Primary))
|
||||||
|
{
|
||||||
AttachPrimaryImageAspectRatio(dto, episodeSeries);
|
AttachPrimaryImageAspectRatio(dto, episodeSeries);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (options.ContainsField(ItemFields.SeriesStudio))
|
if (options.ContainsField(ItemFields.SeriesStudio))
|
||||||
{
|
{
|
||||||
|
@ -1185,10 +1188,13 @@ namespace Emby.Server.Implementations.Dto
|
||||||
if (series != null)
|
if (series != null)
|
||||||
{
|
{
|
||||||
dto.SeriesPrimaryImageTag = GetTagAndFillBlurhash(dto, series, ImageType.Primary);
|
dto.SeriesPrimaryImageTag = GetTagAndFillBlurhash(dto, series, ImageType.Primary);
|
||||||
|
if (!dto.ImageTags.ContainsKey(ImageType.Primary))
|
||||||
|
{
|
||||||
AttachPrimaryImageAspectRatio(dto, series);
|
AttachPrimaryImageAspectRatio(dto, series);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (item is MusicVideo musicVideo)
|
if (item is MusicVideo musicVideo)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue