Merge branch 'master' into warn12

This commit is contained in:
Bond_009
2020-01-10 21:18:16 +01:00
156 changed files with 2310 additions and 7588 deletions

View File

@@ -393,9 +393,9 @@ namespace Emby.Server.Implementations.Library
// Add this flag to GetDeletePaths if required in the future
var isRequiredForDelete = true;
foreach (var fileSystemInfo in item.GetDeletePaths().ToList())
foreach (var fileSystemInfo in item.GetDeletePaths())
{
if (File.Exists(fileSystemInfo.FullName))
if (Directory.Exists(fileSystemInfo.FullName) || File.Exists(fileSystemInfo.FullName))
{
try
{