aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Providers/Playlists
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-08-14 09:24:30 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-08-14 09:24:30 -0400
commit9c5cceb4ecc277ffb5a3a988f655ad674bf41c58 (patch)
tree0077c03cb06e2dc7700315f90db9ee51fedeb00d /MediaBrowser.Providers/Playlists
parent02e25b48550ffef016d20fe3f070c8552633cbef (diff)
update translations
Diffstat (limited to 'MediaBrowser.Providers/Playlists')
-rw-r--r--MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
index d7615eb02..41c4dcb0d 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
@@ -1,5 +1,7 @@
-using MediaBrowser.Common.IO;
+using System.Linq;
+using MediaBrowser.Common.IO;
using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Playlists;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
@@ -40,7 +42,11 @@ namespace MediaBrowser.Providers.Playlists
if (mergeMetadataSettings)
{
- target.LinkedChildren = source.LinkedChildren;
+ var list = source.LinkedChildren.ToList();
+
+ list.AddRange(target.LinkedChildren);
+
+ target.LinkedChildren = list;
}
}
}