From cc73830cd6df7049281df6e43615096a5b47ccb4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 17 Dec 2016 03:27:41 -0500
Subject: fix music album image inheritance

---
 .../Data/BaseSqliteRepository.cs                       |  5 ++++-
 Emby.Server.Implementations/Dto/DtoService.cs          | 18 ++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 206422176..64a0d889e 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -286,7 +286,10 @@ namespace Emby.Server.Implementations.Data
                         {
                             if (_connection != null)
                             {
-                                _connection.Close();
+                                using (_connection)
+                                {
+                                    
+                                }
                                 _connection = null;
                             }
 
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index d0c473777..8e6c1263d 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -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);
             }
         }
 
-- 
cgit v1.2.3