From fd261cecf75dc6e5f9e617578e7c648477eb74a5 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti 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 From 09ae4bf341c0cd4d979b7262434736a45639d43b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 17 Apr 2015 01:09:12 -0400 Subject: update user views --- MediaBrowser.Server.Implementations/Library/UserViewManager.cs | 1 + 1 file changed, 1 insertion(+) (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 73dcc69d2..a21b19e04 100644 --- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs +++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs @@ -234,6 +234,7 @@ namespace MediaBrowser.Server.Implementations.Library public Task GetUserView(Guid parentId, string name, string viewType, bool enableRichView, string sortName, User user, CancellationToken cancellationToken) { + viewType = enableRichView ? viewType : null; return _libraryManager.GetNamedView(user, name, parentId.ToString("N"), viewType, sortName, cancellationToken); } -- cgit v1.2.3