aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.Controller/Providers/DirectoryService.cs6
-rw-r--r--MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs5
2 files changed, 10 insertions, 1 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;