Merge branch 'dev' of https://github.com/hatharry/Emby.git

1 files changed, 4 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
index b4cda39cd..039a17100 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -37,14 +37,16 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
 
             if (!args.IsDirectory)
             {
-                if (_libraryManager.IsAudioFile(args.Path))
+                var libraryOptions = args.GetLibraryOptions();
+
+                if (_libraryManager.IsAudioFile(args.Path, libraryOptions))
                 {
                     var collectionType = args.GetCollectionType();
 
                     var isMixed = string.IsNullOrWhiteSpace(collectionType);
 
                     // For conflicting extensions, give priority to videos
-                    if (isMixed && _libraryManager.IsVideoFile(args.Path))
+                    if (isMixed && _libraryManager.IsVideoFile(args.Path, libraryOptions))
                     {
                         return null;
                     }