From fd261cecf75dc6e5f9e617578e7c648477eb74a5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 16 Apr 2015 23:31:19 -0400
Subject: resolve photo scan hang

---
 MediaBrowser.Server.Implementations/Library/UserViewManager.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library/UserViewManager.cs')

diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index d5d0af74c..73dcc69d2 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -209,7 +209,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
                 var enableRichView = !user.Configuration.PlainFolderViews.Contains(parentId.ToString("N"), StringComparer.OrdinalIgnoreCase);
 
-                if (_config.Configuration.EnableUserSpecificUserViews)
+                if (_config.Configuration.EnableUserSpecificUserViews || !enableRichView)
                 {
                     viewType = enableRichView ? viewType : null;
                     var view = await _libraryManager.GetNamedView(user, name, viewType, sortName, cancellationToken).ConfigureAwait(false);
@@ -222,7 +222,6 @@ namespace MediaBrowser.Server.Implementations.Library
                     return view;
                 }
 
-                viewType = enableRichView ? viewType : CollectionType.Folders;
                 return await _libraryManager.GetNamedView(user, name, viewType, sortName, cancellationToken).ConfigureAwait(false);
             }
             else
-- 
cgit v1.2.3