Merge branch 'beta'

1 files changed, 4 insertions, 4 deletions

diff --git a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
index cba19a5c2..3cf657c44 100644
--- a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
+++ b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
@@ -47,11 +47,11 @@ namespace MediaBrowser.Providers.BoxSets
 
             if (mergeMetadataSettings)
             {
-                var list = sourceItem.LinkedChildren.Where(i => i.Type != LinkedChildType.Manual).ToList();
+                // Retain shortcut children
+                var linkedChildren = sourceItem.LinkedChildren.ToList();
+                linkedChildren.AddRange(sourceItem.LinkedChildren.Where(i => i.Type == LinkedChildType.Shortcut));
 
-                list.AddRange(targetItem.LinkedChildren.Where(i => i.Type == LinkedChildType.Manual));
-
-                targetItem.LinkedChildren = list;
+                targetItem.LinkedChildren = linkedChildren;
                 targetItem.Shares = sourceItem.Shares;
             }
         }