support xbmc -trailer suffix

1 files changed, 6 insertions, 0 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs
index f8e9f32b5..ba7590e7f 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs
@@ -31,6 +31,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
                 {
                     return base.Resolve(args);
                 }
+
+                // Support xbmc local trailer convention, but only when looking for local trailers (hence the parent == null check)
+                if (args.Parent == null && Path.GetFileNameWithoutExtension(args.Path).EndsWith(BaseItem.XbmcTrailerFileSuffix, StringComparison.OrdinalIgnoreCase))
+                {
+                    return base.Resolve(args);
+                }
             }
 
             return null;