Merge pull request #954 from MediaBrowser/dev

3.0.5462.0

1 files changed, 7 insertions, 2 deletions

diff --git a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
index 76d5d7dd7..062519f9d 100644
--- a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
+++ b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
@@ -38,12 +38,17 @@ namespace MediaBrowser.Providers.BoxSets
 
             if (mergeMetadataSettings)
             {
-                var list = source.LinkedChildren.ToList();
+                var list = source.LinkedChildren.Where(i => i.Type != LinkedChildType.Manual).ToList();
 
-                list.AddRange(target.LinkedChildren.Where(i => i.Type == LinkedChildType.Shortcut));
+                list.AddRange(target.LinkedChildren.Where(i => i.Type == LinkedChildType.Manual));
 
                 target.LinkedChildren = list;
             }
+
+            if (replaceData || target.Shares.Count == 0)
+            {
+                target.Shares = source.Shares;
+            }
         }
 
         protected override ItemUpdateType BeforeSave(BoxSet item)