From e1fb68b70c6e8ab9602dfc8bdbdf8be2811286d3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 13 Nov 2013 14:45:20 -0500 Subject: [PATCH] make sure theme song owner id is correct --- MediaBrowser.Api/LibraryService.cs | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/MediaBrowser.Api/LibraryService.cs b/MediaBrowser.Api/LibraryService.cs index 2e9ea6cebe..582eb6f497 100644 --- a/MediaBrowser.Api/LibraryService.cs +++ b/MediaBrowser.Api/LibraryService.cs @@ -615,9 +615,15 @@ namespace MediaBrowser.Api if (album != null) { - themeSongIds = album.SoundtrackIds - .SelectMany(i => _libraryManager.GetItemById(i).ThemeSongIds) - .ToList(); + var linkedItemWithThemes = album.SoundtrackIds + .Select(i => _libraryManager.GetItemById(i)) + .FirstOrDefault(i => i.ThemeSongIds.Count > 0); + + if (linkedItemWithThemes != null) + { + themeSongIds = linkedItemWithThemes.ThemeSongIds; + item = linkedItemWithThemes; + } } } @@ -677,9 +683,15 @@ namespace MediaBrowser.Api if (album != null) { - themeVideoIds = album.SoundtrackIds - .SelectMany(i => _libraryManager.GetItemById(i).ThemeVideoIds) - .ToList(); + var linkedItemWithThemes = album.SoundtrackIds + .Select(i => _libraryManager.GetItemById(i)) + .FirstOrDefault(i => i.ThemeVideoIds.Count > 0); + + if (linkedItemWithThemes != null) + { + themeVideoIds = linkedItemWithThemes.ThemeVideoIds; + item = linkedItemWithThemes; + } } }