aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Library/UserViewManager.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-02-24 15:21:37 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-02-24 15:21:37 -0500
commita73eeac6869edc199c4d0915d07b6847d0c95524 (patch)
tree378241f264bbd6106ea6e958e5bf346d1f76b86e /Emby.Server.Implementations/Library/UserViewManager.cs
parentc456490de43082f008dd592345e76cf75db1ad0a (diff)
parentcd6b7f3bdc5bcbc6c68131cc40b71b68ac1b73a6 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/Emby
Diffstat (limited to 'Emby.Server.Implementations/Library/UserViewManager.cs')
-rw-r--r--Emby.Server.Implementations/Library/UserViewManager.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Library/UserViewManager.cs b/Emby.Server.Implementations/Library/UserViewManager.cs
index f11cbd498..9e1291847 100644
--- a/Emby.Server.Implementations/Library/UserViewManager.cs
+++ b/Emby.Server.Implementations/Library/UserViewManager.cs
@@ -248,6 +248,13 @@ namespace Emby.Server.Implementations.Library
}
}
+ var isPlayed = request.IsPlayed;
+
+ if (parents.OfType<ICollectionFolder>().Any(i => string.Equals(i.CollectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase)))
+ {
+ isPlayed = null;
+ }
+
if (parents.Count == 0)
{
parents = user.RootFolder.GetChildren(user, true)
@@ -282,7 +289,7 @@ namespace Emby.Server.Implementations.Library
IsVirtualItem = false,
Limit = limit * 5,
SourceTypes = parents.Count == 0 ? new[] { SourceType.Library } : new SourceType[] { },
- IsPlayed = request.IsPlayed
+ IsPlayed = isPlayed
}, parents);
}