From c401761f91e3c477fd9292ba82cd28ed60550488 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 27 Jan 2016 13:08:35 -0500 Subject: fix collection content getting lost --- MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs') diff --git a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs index cba19a5c2..886099a86 100644 --- a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs +++ b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs @@ -47,11 +47,7 @@ namespace MediaBrowser.Providers.BoxSets if (mergeMetadataSettings) { - var list = sourceItem.LinkedChildren.Where(i => i.Type != LinkedChildType.Manual).ToList(); - - list.AddRange(targetItem.LinkedChildren.Where(i => i.Type == LinkedChildType.Manual)); - - targetItem.LinkedChildren = list; + targetItem.LinkedChildren = sourceItem.LinkedChildren; targetItem.Shares = sourceItem.Shares; } } -- cgit v1.2.3 From 371e78a39697ef598a119169f2a2341d4ff2c5d1 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 27 Jan 2016 13:26:15 -0500 Subject: preserve shortcut children --- MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs') diff --git a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs index 886099a86..3cf657c44 100644 --- a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs +++ b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs @@ -47,7 +47,11 @@ namespace MediaBrowser.Providers.BoxSets if (mergeMetadataSettings) { - targetItem.LinkedChildren = sourceItem.LinkedChildren; + // Retain shortcut children + var linkedChildren = sourceItem.LinkedChildren.ToList(); + linkedChildren.AddRange(sourceItem.LinkedChildren.Where(i => i.Type == LinkedChildType.Shortcut)); + + targetItem.LinkedChildren = linkedChildren; targetItem.Shares = sourceItem.Shares; } } -- cgit v1.2.3