fixes #200 - MB3 Locking Folders for a long time

3 files changed, 13 insertions, 12 deletions

diff --git a/MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs
index b7798309ba..7eaf95a084 100644
--- a/MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs
@@ -15,7 +15,8 @@ namespace MediaBrowser.Controller.Providers.TV
     /// </summary>
     public class EpisodeImageFromMediaLocationProvider : BaseMetadataProvider
     {
-        public EpisodeImageFromMediaLocationProvider(ILogManager logManager, IServerConfigurationManager configurationManager) : base(logManager, configurationManager)
+        public EpisodeImageFromMediaLocationProvider(ILogManager logManager, IServerConfigurationManager configurationManager)
+            : base(logManager, configurationManager)
         {
         }
 
@@ -60,7 +61,7 @@ namespace MediaBrowser.Controller.Providers.TV
         public override Task<bool> FetchAsync(BaseItem item, bool force, CancellationToken cancellationToken)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            
+
             var episode = (Episode)item;
 
             var episodeFileName = Path.GetFileName(episode.Path);
@@ -70,7 +71,7 @@ namespace MediaBrowser.Controller.Providers.TV
             ValidateImage(episode, item.MetaLocation);
 
             cancellationToken.ThrowIfCancellationRequested();
-            
+
             SetPrimaryImagePath(episode, parent, item.MetaLocation, episodeFileName);
 
             SetLastRefreshed(item, DateTime.UtcNow);
@@ -98,7 +99,7 @@ namespace MediaBrowser.Controller.Providers.TV
                 return;
             }
 
-            if (!episode.Parent.ResolveArgs.GetMetaFileByPath(path).HasValue)
+            if (episode.Parent.ResolveArgs.GetMetaFileByPath(path) == null)
             {
                 episode.PrimaryImagePath = null;
             }
@@ -122,9 +123,9 @@ namespace MediaBrowser.Controller.Providers.TV
             var file = parent.ResolveArgs.GetMetaFileByPath(imageFiles[0]) ??
                        parent.ResolveArgs.GetMetaFileByPath(imageFiles[1]);
 
-            if (file.HasValue)
+            if (file != null)
             {
-                item.PrimaryImagePath = file.Value.Path;
+                item.PrimaryImagePath = file.FullName;
             }
         }
     }
diff --git a/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs b/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs
index e6fb2eb4fc..0e7f1e66ef 100644
--- a/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs
@@ -71,12 +71,12 @@ namespace MediaBrowser.Controller.Providers.TV
 
             var file = item.ResolveArgs.Parent.ResolveArgs.GetMetaFileByPath(metadataFile);
 
-            if (!file.HasValue)
+            if (file == null)
             {
                 return base.CompareDate(item);
             }
 
-            return file.Value.LastWriteTimeUtc;
+            return file.LastWriteTimeUtc;
         }
 
         /// <summary>
@@ -93,7 +93,7 @@ namespace MediaBrowser.Controller.Providers.TV
 
             var file = item.ResolveArgs.Parent.ResolveArgs.GetMetaFileByPath(metadataFile);
 
-            if (!file.HasValue)
+            if (file == null)
             {
                 return false;
             }
diff --git a/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs b/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs
index 556ef24c9f..7867930697 100644
--- a/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs
@@ -47,7 +47,7 @@ namespace MediaBrowser.Controller.Providers.TV
         protected override DateTime CompareDate(BaseItem item)
         {
             var entry = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, "series.xml"));
-            return entry != null ? entry.Value.LastWriteTimeUtc : DateTime.MinValue;
+            return entry != null ? entry.LastWriteTimeUtc : DateTime.MinValue;
         }
 
         /// <summary>
@@ -74,9 +74,9 @@ namespace MediaBrowser.Controller.Providers.TV
             
             var metadataFile = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, "series.xml"));
 
-            if (metadataFile.HasValue)
+            if (metadataFile != null)
             {
-                var path = metadataFile.Value.Path;
+                var path = metadataFile.FullName;
 
                 await XmlParsingResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);