diff options
| author | Artiume <siderite@gmail.com> | 2020-01-09 12:14:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-09 12:14:54 -0500 |
| commit | a40cb7bbd865ec3a693c74669dcc341ecac85169 (patch) | |
| tree | 85aa8a335a122d87608aef3afa3ed07125722803 /Emby.Server.Implementations/IO/ManagedFileSystem.cs | |
| parent | 5b559979845a1c050176e3083e6307e56b43182c (diff) | |
| parent | 162c1ac7b7fde0e4929cf262b0f275e3eb15524c (diff) | |
Merge pull request #7 from jellyfin/master
nightly
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) { |