michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2764 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-07-21 15:09:00 -04:00 committed by GitHub
commit f559543bd2
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Controller/Providers/DirectoryService.cs
View File

@ -120,10 +120,14 @@ namespace MediaBrowser.Controller.Providers
{ {
file = _fileSystem.GetFileInfo(path); file = _fileSystem.GetFileInfo(path);
if (file != null) if (file != null && file.Exists)
{ {
_fileCache.TryAdd(path, file); _fileCache.TryAdd(path, file);
} }
else
{
return null;
}
} }
return file; return file;

5
MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
View File

@ -51,6 +51,11 @@ namespace MediaBrowser.XbmcMetadata.Savers
//} //}
list.Add(Path.ChangeExtension(item.Path, ".nfo")); list.Add(Path.ChangeExtension(item.Path, ".nfo"));
if (!item.IsInMixedFolder)
{
list.Add(Path.Combine(item.ContainingFolderPath, "movie.nfo"));
}
} }
return list; return list;

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.25.10")] [assembly: AssemblyVersion("3.2.25.11")]