diff --git a/MediaBrowser.Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Providers/ImageFromMediaLocationProvider.cs
index aa0dcc9d47..65eee0f3a6 100644
--- a/MediaBrowser.Providers/ImageFromMediaLocationProvider.cs
+++ b/MediaBrowser.Providers/ImageFromMediaLocationProvider.cs
@@ -388,17 +388,33 @@ namespace MediaBrowser.Providers
/// The args.
private void PopulateBackdrops(BaseItem item, ItemResolveArgs args)
{
+ var isFileSystemItem = item.LocationType == LocationType.FileSystem;
+
var backdropFiles = new List();
PopulateBackdrops(item, args, backdropFiles, "backdrop", "backdrop");
+ // Support {name}-fanart.ext
+ if (isFileSystemItem)
+ {
+ var name = Path.GetFileNameWithoutExtension(item.Path);
+
+ if (!string.IsNullOrEmpty(name))
+ {
+ var image = GetImage(item, args, name + "-fanart");
+
+ if (image != null)
+ {
+ backdropFiles.Add(image.FullName);
+ }
+ }
+ }
+
// Support plex/xbmc conventions
PopulateBackdrops(item, args, backdropFiles, "fanart", "fanart-");
PopulateBackdrops(item, args, backdropFiles, "background", "background-");
PopulateBackdrops(item, args, backdropFiles, "art", "art-");
- var isFileSystemItem = item.LocationType == LocationType.FileSystem;
-
if (item is Season && item.IndexNumber.HasValue && isFileSystemItem)
{
var seasonMarker = item.IndexNumber.Value == 0