alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 09:04:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix music album image inheritance

Browse Source
This commit is contained in:
Luke Pulverenti
2016-12-17 03:27:41 -05:00
parent ef490818d7
commit cc73830cd6
6 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Server.Implementations/Data/BaseSqliteRepository.cs
View File

@@ -286,7 +286,10 @@ namespace Emby.Server.Implementations.Data
{
if (_connection != null)
{
_connection.Close();
using (_connection)
{
}
_connection = null;
}

18
Emby.Server.Implementations/Dto/DtoService.cs
View File

@@ -1504,6 +1504,20 @@ namespace Emby.Server.Implementations.Dto
}
}
private BaseItem GetImageDisplayParent(BaseItem item)
{
var musicAlbum = item as MusicAlbum;
if (musicAlbum != null)
{
var artist = musicAlbum.MusicArtist;
if (artist != null)
{
return artist;
}
}
return item.GetParent();
}
private void AddInheritedImages(BaseItemDto dto, BaseItem item, DtoOptions options, BaseItem owner)
{
if (!item.SupportsInheritedParentImages)
@@ -1528,7 +1542,7 @@ namespace Emby.Server.Implementations.Dto
var isFirst = true;
while (((!dto.HasLogo && logoLimit > 0) || (!dto.HasArtImage && artLimit > 0) || (!dto.HasThumb && thumbLimit > 0) || parent is Series) &&
(parent = parent ?? (isFirst ? item.GetParent() ?? owner : parent)) != null)
(parent = parent ?? (isFirst ? GetImageDisplayParent(item) ?? owner : parent)) != null)
{
if (parent == null)
{
@@ -1585,7 +1599,7 @@ namespace Emby.Server.Implementations.Dto
break;
}
parent = parent.GetParent();
parent = GetImageDisplayParent(parent);
}
}