diff options
| author | Bond_009 <bond.009@outlook.com> | 2020-01-09 18:26:22 +0100 |
|---|---|---|
| committer | Bond_009 <bond.009@outlook.com> | 2020-01-09 18:26:22 +0100 |
| commit | b50c4938e19eaa4508dd9192bc63c3788c2fa3eb (patch) | |
| tree | e8a29d7c1ecc22b20287a940d757d635b5208b00 /Emby.Server.Implementations/IO/ManagedFileSystem.cs | |
| parent | a1ca50fd5a74eafa6e609976d90cad42b54137e5 (diff) | |
| parent | 162c1ac7b7fde0e4929cf262b0f275e3eb15524c (diff) | |
Merge branch 'master' into namingtests
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) { |