3 files changed, 13 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index dd2afcb3f..7e84350b3 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -26,12 +26,11 @@ namespace MediaBrowser.Controller.Library
         /// <summary>
         /// Resolves a path into a BaseItem
         /// </summary>
-        /// <param name="path">The path.</param>
-        /// <param name="parent">The parent.</param>
         /// <param name="fileInfo">The file info.</param>
+        /// <param name="parent">The parent.</param>
         /// <returns>BaseItem.</returns>
         /// <exception cref="System.ArgumentNullException"></exception>
-        BaseItem ResolvePath(string path, Folder parent = null, FileSystemInfo fileInfo = null);
+        BaseItem ResolvePath(FileSystemInfo fileInfo, Folder parent = null);
 
         /// <summary>
         /// Resolves a set of files into a list of BaseItem
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index 0ddf61f19..9ca2b6ad5 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -68,7 +68,7 @@ namespace MediaBrowser.Controller.Library
         {
             get
             {
-                return FileInfo.Attributes.HasFlag(FileAttributes.Directory);
+                return (FileInfo.Attributes & FileAttributes.Directory) == FileAttributes.Directory;
             }
         }
 
@@ -80,7 +80,7 @@ namespace MediaBrowser.Controller.Library
         {
             get
             {
-                return FileInfo.Attributes.HasFlag(FileAttributes.Hidden);
+                return (FileInfo.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden;
             }
         }
 
@@ -92,7 +92,7 @@ namespace MediaBrowser.Controller.Library
         {
             get
             {
-                return FileInfo.Attributes.HasFlag(FileAttributes.System);
+                return (FileInfo.Attributes & FileAttributes.System) == FileAttributes.System;
             }
         }
 
@@ -213,7 +213,7 @@ namespace MediaBrowser.Controller.Library
         /// <exception cref="System.IO.FileNotFoundException"></exception>
         public void AddMetadataFile(string path)
         {
-            var file = FileSystem.GetFileSystemInfo(path);
+            var file = new FileInfo(path);
 
             if (!file.Exists)
             {
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index 046dd7698..921bbb808 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -197,12 +197,17 @@ namespace MediaBrowser.Controller.Library
             {
                 var attributes = child.Attributes;
 
-                if (attributes.HasFlag(FileAttributes.Hidden) || attributes.HasFlag(FileAttributes.System))
+                if ((attributes & FileAttributes.Hidden) == FileAttributes.Hidden)
                 {
                     continue;
                 }
 
-                if (attributes.HasFlag(FileAttributes.Directory))
+                if ((attributes & FileAttributes.System) == FileAttributes.System)
+                {
+                    continue;
+                }
+
+                if ((attributes & FileAttributes.Directory) == FileAttributes.Directory)
                 {
                     if (IsSeasonFolder(child.FullName))
                     {