more sync movement

1 files changed, 15 insertions, 4 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index e06720192..bfdfc03ba 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -736,16 +736,27 @@ namespace MediaBrowser.Server.Implementations.Library
         }
 
         private UserRootFolder _userRootFolder;
+        private readonly object _syncLock = new object();
         public Folder GetUserRootFolder()
         {
             if (_userRootFolder == null)
             {
-                var userRootPath = ConfigurationManager.ApplicationPaths.DefaultUserViewsPath;
+                lock (_syncLock)
+                {
+                    if (_userRootFolder == null)
+                    {
+                        var userRootPath = ConfigurationManager.ApplicationPaths.DefaultUserViewsPath;
 
-                Directory.CreateDirectory(userRootPath);
+                        Directory.CreateDirectory(userRootPath);
 
-                _userRootFolder = GetItemById(GetNewItemId(userRootPath, typeof(UserRootFolder))) as UserRootFolder ??
-                                  (UserRootFolder)ResolvePath(new DirectoryInfo(userRootPath));
+                        _userRootFolder = GetItemById(GetNewItemId(userRootPath, typeof(UserRootFolder))) as UserRootFolder;
+
+                        if (_userRootFolder == null)
+                        {
+                            _userRootFolder = (UserRootFolder)ResolvePath(new DirectoryInfo(userRootPath));
+                        }
+                    }
+                }
             }
 
             return _userRootFolder;