diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-12 15:03:56 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-12 15:03:56 -0500 |
| commit | 21f1d96ee902b897b5242be130783571bdfc2226 (patch) | |
| tree | b861aa966c7521f1faf8a0eec745943bb0037b03 /MediaBrowser.Server.Implementations/Collections/CollectionManager.cs | |
| parent | d6614728448a82bece05738b1a24f1bff861687e (diff) | |
| parent | d06b78d9398330b98828d752d7fe49232ffdb3d0 (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'MediaBrowser.Server.Implementations/Collections/CollectionManager.cs')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Collections/CollectionManager.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs index 5c98e401f4..4e742ca7a2 100644 --- a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs +++ b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs @@ -40,6 +40,7 @@ namespace MediaBrowser.Server.Implementations.Collections public Folder GetCollectionsFolder(string userId) { return _libraryManager.RootFolder.Children.OfType<ManualCollectionsFolder>() + .FirstOrDefault() ?? _libraryManager.GetUserRootFolder().Children.OfType<ManualCollectionsFolder>() .FirstOrDefault(); } |