diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-01-08 18:10:17 +0100 |
|---|---|---|
| committer | Bond-009 <bond.009@outlook.com> | 2020-01-08 18:10:17 +0100 |
| commit | c3752b1a3080f6f54c77a436c7d0b309792b8872 (patch) | |
| tree | c762d033f487407f483b03e2f16ac7bec44ad22c /Emby.Server.Implementations/IO/ManagedFileSystem.cs | |
| parent | 9dfafb9e9fcddb253b157fe03b085b7fceef4290 (diff) | |
| parent | 124a852787ff94201de452a952eb31376beafe12 (diff) | |
Merge branch 'master' into scanerrors
Diffstat (limited to 'Emby.Server.Implementations/IO/ManagedFileSystem.cs')
| -rw-r--r-- | Emby.Server.Implementations/IO/ManagedFileSystem.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs index 442fbabd1..9568f62df 100644 --- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs +++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs @@ -109,7 +109,7 @@ namespace Emby.Server.Implementations.IO } try { - return Path.Combine(Path.GetFullPath(folderPath), filePath); + return Path.GetFullPath(Path.Combine(folderPath, filePath)); } catch (ArgumentException) { |