aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-04-16 23:31:19 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-04-16 23:31:19 -0400
commitfd261cecf75dc6e5f9e617578e7c648477eb74a5 (patch)
tree60230a6a29bdff7da8b76f6bfbeb2028c4a8fbaa /MediaBrowser.Server.Implementations/Library/UserViewManager.cs
parent6bd18c6e72d1c4ba9c371d37411ebd918d8c6d9e (diff)
resolve photo scan hang
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/UserViewManager.cs')
-rw-r--r--MediaBrowser.Server.Implementations/Library/UserViewManager.cs3
1 files changed, 1 insertions, 2 deletions
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