1 files changed, 10 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
index 62eb1f47d..b4cda39cd 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -41,10 +41,19 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
                 {
                     var collectionType = args.GetCollectionType();
 
+                    var isMixed = string.IsNullOrWhiteSpace(collectionType);
+
+                    // For conflicting extensions, give priority to videos
+                    if (isMixed && _libraryManager.IsVideoFile(args.Path))
+                    {
+                        return null;
+                    }
+
                     var isStandalone = args.Parent == null;
 
                     if (isStandalone ||
-                        string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase))
+                        string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase) ||
+                        isMixed)
                     {
                         return new Controller.Entities.Audio.Audio();
                     }