diff options
Diffstat (limited to 'Emby.Server.Implementations')
| -rw-r--r-- | Emby.Server.Implementations/Library/LibraryManager.cs | 5 | ||||
| -rw-r--r-- | Emby.Server.Implementations/UserViews/DynamicImageProvider.cs | 12 |
2 files changed, 6 insertions, 11 deletions
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index 283d193dd6..8fb28fb591 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -1069,6 +1069,11 @@ namespace Emby.Server.Implementations.Library { _logger.Info("Validating media library"); + // Ensure these objects are lazy loaded. + // Without this there is a deadlock that will need to be investigated + var rootChildren = RootFolder.Children.ToList(); + rootChildren = GetUserRootFolder().Children.ToList(); + await RootFolder.RefreshMetadata(cancellationToken).ConfigureAwait(false); progress.Report(.5); diff --git a/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs b/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs index 09b68c8ea3..245fe8ebe5 100644 --- a/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs +++ b/Emby.Server.Implementations/UserViews/DynamicImageProvider.cs @@ -151,17 +151,7 @@ namespace Emby.Server.Implementations.UserViews string[] collectionStripViewTypes = { CollectionType.Movies, - CollectionType.TvShows, - CollectionType.Music, - CollectionType.Games, - CollectionType.Books, - CollectionType.MusicVideos, - CollectionType.HomeVideos, - CollectionType.BoxSets, - CollectionType.LiveTv, - CollectionType.Playlists, - CollectionType.Photos, - string.Empty + CollectionType.TvShows }; return collectionStripViewTypes.Contains(view.ViewType ?? string.Empty); |