diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-10-23 02:06:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 02:06:37 -0400 |
| commit | 3129feee75d2ba0b0c086776265c193b3d6027ee (patch) | |
| tree | 06fa279036bcbebd6db825424c288bb4b9c7169a /Emby.Server.Implementations/Library | |
| parent | 3fd4dea0aeb20c1a1acd237639808d8ca8a37190 (diff) | |
| parent | 141e5b56b0a9c2cdf125314abc68e61dd414bda9 (diff) | |
Merge pull request #2971 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Library')
| -rw-r--r-- | Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs index a9cfea34d..311abf14e 100644 --- a/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs +++ b/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs @@ -30,8 +30,11 @@ namespace Emby.Server.Implementations.Library.Resolvers // Must be an image file within a photo collection if (args.IsDirectory) { - if (string.Equals(args.GetCollectionType(), CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase) || - string.Equals(args.GetCollectionType(), CollectionType.Photos, StringComparison.OrdinalIgnoreCase)) + // Must be an image file within a photo collection + var collectionType = args.GetCollectionType(); + + if (string.Equals(collectionType, CollectionType.Photos, StringComparison.OrdinalIgnoreCase) || + (string.Equals(collectionType, CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase) && args.GetLibraryOptions().EnablePhotos)) { if (HasPhotos(args)) { |