diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-06 12:28:05 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-06 12:28:05 -0500 |
| commit | c6580287f5886609fadb9144f2e62f4eb1076a26 (patch) | |
| tree | 627420816b26f391291d83a72923d35e9851da65 /MediaBrowser.Server.Implementations/Collections/CollectionManager.cs | |
| parent | f19e3ca7a85ffb54895dfbbc33c595b06a540c76 (diff) | |
| parent | b67683e0b5fffc3cce5ddcb8d77f965b8508adb8 (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 5c98e401f..4e742ca7a 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(); } |