10 files changed, 45 insertions, 11 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index b3df34c4d..1897511af 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -46,6 +46,12 @@ namespace MediaBrowser.Controller.Entities.Audio
             }
         }
 
+        [IgnoreDataMember]
+        public override bool EnableForceSaveOnDateModifiedChange
+        {
+            get { return true; }
+        }
+
         public Audio()
         {
             Artists = new List<string>();
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 0860cb61c..c7a6b75ff 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -455,7 +455,10 @@ namespace MediaBrowser.Controller.Entities
         public DateTime DateLastRefreshed { get; set; }
 
         [IgnoreDataMember]
-        public DateTime? DateModifiedDuringLastRefresh { get; set; }
+        public virtual bool EnableForceSaveOnDateModifiedChange
+        {
+            get { return false; }
+        }
 
         /// <summary>
         /// The logger
diff --git a/MediaBrowser.Controller/Entities/Book.cs b/MediaBrowser.Controller/Entities/Book.cs
index 2ca56bc70..59ab95437 100644
--- a/MediaBrowser.Controller/Entities/Book.cs
+++ b/MediaBrowser.Controller/Entities/Book.cs
@@ -34,6 +34,12 @@ namespace MediaBrowser.Controller.Entities
             return SeriesName;
         }
 
+        [IgnoreDataMember]
+        public override bool EnableForceSaveOnDateModifiedChange
+        {
+            get { return true; }
+        }
+
         public Guid? FindSeriesId()
         {
             return SeriesId;
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 89b9479e7..0397e9a88 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -373,13 +373,6 @@ namespace MediaBrowser.Controller.Entities
 
                     if (currentChildren.TryGetValue(child.Id, out currentChild) && IsValidFromResolver(currentChild, child))
                     {
-                        var currentChildLocationType = currentChild.LocationType;
-                        if (currentChildLocationType != LocationType.Remote &&
-                            currentChildLocationType != LocationType.Virtual)
-                        {
-                            currentChild.DateModified = child.DateModified;
-                        }
-
                         await UpdateIsOffline(currentChild, false).ConfigureAwait(false);
                         validChildren.Add(currentChild);
 
diff --git a/MediaBrowser.Controller/Entities/Game.cs b/MediaBrowser.Controller/Entities/Game.cs
index 317c71529..54386a179 100644
--- a/MediaBrowser.Controller/Entities/Game.cs
+++ b/MediaBrowser.Controller/Entities/Game.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -32,6 +33,12 @@ namespace MediaBrowser.Controller.Entities
                    locationType != LocationType.Virtual;
         }
 
+        [IgnoreDataMember]
+        public override bool EnableForceSaveOnDateModifiedChange
+        {
+            get { return true; }
+        }
+
         /// <summary>
         /// Gets or sets the remote trailers.
         /// </summary>
@@ -42,6 +49,7 @@ namespace MediaBrowser.Controller.Entities
         /// Gets the type of the media.
         /// </summary>
         /// <value>The type of the media.</value>
+        [IgnoreDataMember]
         public override string MediaType
         {
             get { return Model.Entities.MediaType.Game; }
diff --git a/MediaBrowser.Controller/Entities/IHasImages.cs b/MediaBrowser.Controller/Entities/IHasImages.cs
index 897250caa..226748098 100644
--- a/MediaBrowser.Controller/Entities/IHasImages.cs
+++ b/MediaBrowser.Controller/Entities/IHasImages.cs
@@ -207,8 +207,6 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="image">The image.</param>
         /// <param name="index">The index.</param>
         void SetImage(ItemImageInfo image, int index);
-
-        DateTime? DateModifiedDuringLastRefresh { get; set; }
     }
 
     public static class HasImagesExtensions
diff --git a/MediaBrowser.Controller/Entities/IHasMetadata.cs b/MediaBrowser.Controller/Entities/IHasMetadata.cs
index c7940c8a9..378c4a390 100644
--- a/MediaBrowser.Controller/Entities/IHasMetadata.cs
+++ b/MediaBrowser.Controller/Entities/IHasMetadata.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Entities
         /// Gets the date modified.
         /// </summary>
         /// <value>The date modified.</value>
-        DateTime DateModified { get; }
+        DateTime DateModified { get; set; }
 
         /// <summary>
         /// Gets or sets the date last saved.
@@ -51,5 +51,7 @@ namespace MediaBrowser.Controller.Entities
         bool SupportsPeople { get; }
 
         bool RequiresRefresh();
+
+        bool EnableForceSaveOnDateModifiedChange { get; }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Photo.cs b/MediaBrowser.Controller/Entities/Photo.cs
index de756563d..804ea04a5 100644
--- a/MediaBrowser.Controller/Entities/Photo.cs
+++ b/MediaBrowser.Controller/Entities/Photo.cs
@@ -51,6 +51,12 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        [IgnoreDataMember]
+        public override bool EnableForceSaveOnDateModifiedChange
+        {
+            get { return true; }
+        }
+
         public override bool CanDownload()
         {
             return true;
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 73c893dd6..eba1e466a 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -58,6 +58,12 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        [IgnoreDataMember]
+        public override bool EnableForceSaveOnDateModifiedChange
+        {
+            get { return true; }
+        }
+
         public int? TotalBitrate { get; set; }
         public ExtraType? ExtraType { get; set; }
 
diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index c057c9707..e7e3323c2 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -102,6 +102,12 @@ namespace MediaBrowser.Controller.Providers
         {
             var directory = Path.GetDirectoryName(path);
 
+            if (string.IsNullOrWhiteSpace(directory))
+            {
+                _logger.Debug("Parent path is null for {0}", path);
+                return null;
+            }
+
             var dict = GetFileSystemDictionary(directory, false);
 
             FileSystemMetadata entry;