Merge remote-tracking branch 'upstream/master'

1 files changed, 15 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
index 0f93e8e8a..9c757503c 100644
--- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
+++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
@@ -71,7 +71,21 @@ namespace MediaBrowser.Controller.Resolvers
                 throw new ArgumentNullException("path");
             }
 
-            return MultiFileRegex.Match(path).Success || MultiFolderRegex.Match(path).Success;
+            path = Path.GetFileName(path);
+
+            return MultiFileRegex.Match(path).Success;
+        }
+
+        public static bool IsMultiPartFolder(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                throw new ArgumentNullException("path");
+            }
+
+            path = Path.GetFileName(path);
+
+            return MultiFolderRegex.Match(path).Success;
         }
 
         /// <summary>