1 files changed, 7 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
index f6e5af7b5..9166067c3 100644
--- a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
@@ -35,6 +35,13 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
         public bool ShouldIgnore(ItemResolveArgs args)
         {
+            // Handle mac .DS_Store
+            // https://github.com/MediaBrowser/MediaBrowser/issues/427
+            if (args.Path.IndexOf("._", StringComparison.OrdinalIgnoreCase) == 0)
+            {
+                return true;    
+            }
+
             // Ignore hidden files and folders
             if (args.IsHidden)
             {