Merge pull request #3012 from MediaBrowser/dev

3.2.36.8

1 files changed, 10 insertions, 2 deletions

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 5eda986e1..f71e2714a 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -710,7 +710,11 @@ namespace Emby.Server.Implementations.Library
             var rootFolder = GetItemById(GetNewItemId(rootFolderPath, typeof(AggregateFolder))) as AggregateFolder ?? (AggregateFolder)ResolvePath(_fileSystem.GetDirectoryInfo(rootFolderPath));
 
             // In case program data folder was moved
-            rootFolder.Path = rootFolderPath;
+            if (!string.Equals(rootFolder.Path, rootFolderPath, StringComparison.Ordinal))
+            {
+                _logger.Info("Resetting root folder path to {0}", rootFolderPath);
+                rootFolder.Path = rootFolderPath;
+            }
 
             // Add in the plug-in folders
             foreach (var child in PluginFolderCreators)
@@ -775,7 +779,11 @@ namespace Emby.Server.Implementations.Library
                         }
 
                         // In case program data folder was moved
-                        tmpItem.Path = userRootPath;
+                        if (!string.Equals(tmpItem.Path, userRootPath, StringComparison.Ordinal))
+                        {
+                            _logger.Info("Resetting user root folder path to {0}", userRootPath);
+                            tmpItem.Path = userRootPath;
+                        }
 
                         _userRootFolder = tmpItem;
                     }