From a2563e13062298467480cd8465153cdc7e851f05 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 25 Feb 2015 23:49:31 +0000 Subject: [PATCH] Revert "Fix metadata fanart selection." The fix for this issue was addressed at a lower level in another commit as a result this code path was reversing the list again. Fixes #12246 This reverts commit da8ac305c3dbe955459a6a12e646b81109552836. Conflicts: mythtv/libs/libmythmetadata/metadatafactory.cpp (cherry picked from commit 09422c5508a74c0d052a78ee14fb4a20ce9ca058) --- mythtv/libs/libmythmetadata/metadatafactory.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mythtv/libs/libmythmetadata/metadatafactory.cpp b/mythtv/libs/libmythmetadata/metadatafactory.cpp index 5c66befe7bb..bc385d83b6b 100644 --- a/mythtv/libs/libmythmetadata/metadatafactory.cpp +++ b/mythtv/libs/libmythmetadata/metadatafactory.cpp @@ -290,12 +290,10 @@ void MetadataFactory::OnSingleResult(MetadataLookup *lookup) if (fanartlist.size()) { ArtworkInfo info; - int index = fanartlist.size(); + int index = 0; int season = lookup->GetIsCollection() ? 0 : (int)lookup->GetSeason(); - if (season > 0) - index = max(0, index-season); - else - index--; + if (season > 0 && season <= fanartlist.count()) + index = season - 1; info.url = fanartlist.takeAt(index).url; map.insert(kArtworkFanart, info); }