alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-15 18:53:27 +01:00
Code Issues Actions 8 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

4
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@@ -811,7 +811,7 @@ namespace Emby.Server.Implementations.Library
public BaseItem FindByPath(string path, bool? isFolder)
{
// If this returns multiple items it could be tricky figuring out which one is correct.
// If this returns multiple items it could be tricky figuring out which one is correct.
// In most cases, the newest one will be and the others obsolete but not yet cleaned up
if (string.IsNullOrEmpty(path))
@@ -1692,7 +1692,7 @@ namespace Emby.Server.Implementations.Library
{
try
{
// Try to resolve the path into a video
// Try to resolve the path into a video
video = ResolvePath(_fileSystem.GetFileSystemInfo(info.Path)) as Video;
if (video == null)