OpenSource/jellyfin
1
0 Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-10-27 00:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into warn12

Browse Source
This commit is contained in:
Bond_009 committed 2020-01-10 21:18:16 +01:00
2 parents 7f5a174dff 162c1ac7b7
commit bb236b9591
156 files changed
+2310 -7588
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Emby.Server.Implementations/IO/ManagedFileSystem.cs
+1 -1
View File
@@ -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)
{