diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-07-21 15:09:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-21 15:09:00 -0400 |
| commit | f559543bd221751ffba6fa5b17ae753778257988 (patch) | |
| tree | 0db53abfe23c66715ffb2fae4ea3d8ad31183cb2 | |
| parent | b43b52c2377cc92b61167b51670d43e831184273 (diff) | |
| parent | e36aae1d75de1a970509d9c5091e39aa446c74fc (diff) | |
Merge pull request #2764 from MediaBrowser/dev
Dev
| -rw-r--r-- | MediaBrowser.Controller/Providers/DirectoryService.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs | 5 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs index 3d1af2afa..6d220f3a3 100644 --- a/MediaBrowser.Controller/Providers/DirectoryService.cs +++ b/MediaBrowser.Controller/Providers/DirectoryService.cs @@ -120,10 +120,14 @@ namespace MediaBrowser.Controller.Providers { file = _fileSystem.GetFileInfo(path); - if (file != null) + if (file != null && file.Exists) { _fileCache.TryAdd(path, file); } + else + { + return null; + } } return file; diff --git a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs index f32f89bc2..aea3f2c70 100644 --- a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs @@ -51,6 +51,11 @@ namespace MediaBrowser.XbmcMetadata.Savers //} list.Add(Path.ChangeExtension(item.Path, ".nfo")); + + if (!item.IsInMixedFolder) + { + list.Add(Path.Combine(item.ContainingFolderPath, "movie.nfo")); + } } return list; diff --git a/SharedVersion.cs b/SharedVersion.cs index 7fed66523..704db59cf 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.25.10")] +[assembly: AssemblyVersion("3.2.25.11")] |