aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Library/LibraryManager.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-12-02 15:52:39 -0500
committerGitHub <noreply@github.com>2016-12-02 15:52:39 -0500
commitd52ee1e6374c47a4460d8069784692cf36693f8c (patch)
treefddc50e09b7eba5c852e63c3e6656466b383c655 /Emby.Server.Implementations/Library/LibraryManager.cs
parent494ae8465f5a0d381594873d4f8951778d7616a7 (diff)
parent4a9c77c32713ed0a52597f9abb7313062ef1872f (diff)
Merge pull request #2323 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Library/LibraryManager.cs')
-rw-r--r--Emby.Server.Implementations/Library/LibraryManager.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 283d193dd..8fb28fb59 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);