aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Library
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-10-22 20:43:52 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-10-22 20:43:52 -0400
commita59ff2760575abe20dd1ae3a35f83e0439e3f497 (patch)
tree461f6163992a3074d29f5adaaff23b7a178b5b78 /Emby.Server.Implementations/Library
parentb54046a6dedf691e33b273d5aa105910efee3c7e (diff)
fix image analysis
Diffstat (limited to 'Emby.Server.Implementations/Library')
-rw-r--r--Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs7
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))
{