From d44f264ac08de43e8f6d1172079b02bcc7090f37 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Tue, 21 Aug 2012 12:33:38 -0400 Subject: [PATCH] Fixed episode image path --- MediaBrowser.Controller/Xml/BaseItemXmlParser.cs | 2 +- .../EpisodeImageFromMediaLocationProvider.cs | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs b/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs index a972274856..f5eecbcde9 100644 --- a/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs @@ -20,7 +20,7 @@ namespace MediaBrowser.Controller.Xml public void Fetch(T item, string metadataFile) { // Use XmlReader for best performance - using (XmlReader reader = XmlReader.Create(metadataFile, new XmlReaderSettings() { })) + using (XmlReader reader = XmlReader.Create(metadataFile)) { reader.MoveToContent(); diff --git a/MediaBrowser.TV/Providers/EpisodeImageFromMediaLocationProvider.cs b/MediaBrowser.TV/Providers/EpisodeImageFromMediaLocationProvider.cs index 131571a360..b98cee2efe 100644 --- a/MediaBrowser.TV/Providers/EpisodeImageFromMediaLocationProvider.cs +++ b/MediaBrowser.TV/Providers/EpisodeImageFromMediaLocationProvider.cs @@ -46,14 +46,22 @@ namespace MediaBrowser.TV.Providers Path.Combine(metadataFolder, Path.ChangeExtension(episodeFileName, ".png")) }; + string image; + if (season == null) { // Gotta do this the slow way - item.PrimaryImagePath = imageFiles.FirstOrDefault(f => File.Exists(f)); + image = imageFiles.FirstOrDefault(f => File.Exists(f)); } else { - item.PrimaryImagePath = imageFiles.FirstOrDefault(f => season.ContainsMetadataFile(f)); + image = imageFiles.FirstOrDefault(f => season.ContainsMetadataFile(f)); + } + + // If we found something, set PrimaryImagePath + if (!string.IsNullOrEmpty(image)) + { + item.PrimaryImagePath = image; } } }