|
@@ -730,10 +730,8 @@ namespace Emby.Server.Implementations.Library
|
|
|
|
|
|
_fileSystem.CreateDirectory(rootFolderPath);
|
|
_fileSystem.CreateDirectory(rootFolderPath);
|
|
|
|
|
|
- var tmpAFolder = new AggregateFolder();
|
|
|
|
- ((Folder)ResolvePath(_fileSystem.GetDirectoryInfo(rootFolderPath))).DeepCopy<Folder,AggregateFolder>(tmpAFolder);
|
|
|
|
- var rootFolder = GetItemById(GetNewItemId(rootFolderPath, typeof(AggregateFolder))) as AggregateFolder ?? tmpAFolder;
|
|
|
|
-
|
|
|
|
|
|
+ var rootFolder = GetItemById(GetNewItemId(rootFolderPath, typeof(AggregateFolder))) as AggregateFolder ?? ((Folder)ResolvePath(_fileSystem.GetDirectoryInfo(rootFolderPath))).DeepCopy<Folder,AggregateFolder>();
|
|
|
|
+
|
|
// In case program data folder was moved
|
|
// In case program data folder was moved
|
|
if (!string.Equals(rootFolder.Path, rootFolderPath, StringComparison.Ordinal))
|
|
if (!string.Equals(rootFolder.Path, rootFolderPath, StringComparison.Ordinal))
|
|
{
|
|
{
|
|
@@ -801,8 +799,7 @@ namespace Emby.Server.Implementations.Library
|
|
|
|
|
|
if (tmpItem == null)
|
|
if (tmpItem == null)
|
|
{
|
|
{
|
|
- tmpItem = new UserRootFolder();
|
|
|
|
- ((Folder)ResolvePath(_fileSystem.GetDirectoryInfo(userRootPath))).DeepCopy<Folder,UserRootFolder>(tmpItem);
|
|
|
|
|
|
+ tmpItem = ((Folder)ResolvePath(_fileSystem.GetDirectoryInfo(userRootPath))).DeepCopy<Folder,UserRootFolder>();
|
|
}
|
|
}
|
|
|
|
|
|
// In case program data folder was moved
|
|
// In case program data folder was moved
|