diff options
| author | Bond_009 <bond.009@outlook.com> | 2020-01-10 21:18:16 +0100 |
|---|---|---|
| committer | Bond_009 <bond.009@outlook.com> | 2020-01-10 21:18:16 +0100 |
| commit | bb236b95916c7fe0fc04fefbb409686ab289a758 (patch) | |
| tree | 72d32e64a7bc36777ad84c3503ccd33075c136db /Emby.Server.Implementations/IO/ManagedFileSystem.cs | |
| parent | 7f5a174dff98c6071fc292a41bba63d1435c2ddd (diff) | |
| parent | 162c1ac7b7fde0e4929cf262b0f275e3eb15524c (diff) | |
Merge branch 'master' into warn12
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 d8da0888e..e27081c45 100644 --- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs +++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs @@ -110,7 +110,7 @@ namespace Emby.Server.Implementations.IO } try { - return Path.Combine(Path.GetFullPath(folderPath), filePath); + return Path.GetFullPath(Path.Combine(folderPath, filePath)); } catch (ArgumentException) { |