aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Library/Resolvers
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-10-04 14:52:50 -0400
committerGitHub <noreply@github.com>2017-10-04 14:52:50 -0400
commit185fa7f5e76a9971e34c35783698d37902ed14cb (patch)
treea840cff09050c5c76645596bfd99bb5dfd5ad4a0 /Emby.Server.Implementations/Library/Resolvers
parentc67f03ee97019aff0af41e8c6f4f8525ef90b5e5 (diff)
parent1caae368d5f75d96dada65cd2175831982363c21 (diff)
Merge pull request #2941 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Library/Resolvers')
-rw-r--r--Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index cd1264754..82f42c745 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -147,7 +147,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
Items = videos
};
- var isInMixedFolder = resolverResult.Count > 1;
+ var isInMixedFolder = resolverResult.Count > 1 || (parent != null && parent.IsTopParent);
foreach (var video in resolverResult)
{