From aef79a796dd029849f3d99c4b59d3652bd83b4a9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 2 Dec 2016 15:10:35 -0500
Subject: update xml parsing

---
 Emby.Server.Implementations/Library/LibraryManager.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Emby.Server.Implementations/Library/LibraryManager.cs')

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);
-- 
cgit v1.2.3