alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 09:34:44 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'dev' into code-cleanup

Browse Source
This commit is contained in:
Erwin de Haan
2019-01-11 12:50:36 +01:00
parent ec1f5dc317 e5c2dbdf23
commit e2751d42e8
345 changed files with 2991 additions and 3236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/IO/FileRefresher.cs
View File

@@ -164,7 +164,7 @@ namespace Emby.Server.Implementations.IO
}
catch (IOException ex)
{
// For now swallow and log.
// For now swallow and log.
// Research item: If an IOException occurs, the item may be in a disconnected state (media unavailable)
// Should we remove it from it's parent?
Logger.LogError(ex, "Error refreshing {name}", item.Name);

2
Emby.Server.Implementations/IO/ManagedFileSystem.cs
View File

@@ -153,7 +153,7 @@ namespace Emby.Server.Implementations.IO
var firstChar = filePath[0];
if (firstChar == '/')
{
// For this we don't really know.
// For this we don't really know.
return filePath;
}
if (firstChar == '\\') //relative path