From 8d11fbb13289bd595f736eb9200b317fb5bb579c Mon Sep 17 00:00:00 2001 From: jmarshallnz Date: Wed, 4 Jun 2014 18:21:49 +1200 Subject: [PATCH 1/1] Merge pull request #4676 from jmarshallnz/dont_set_scraper_on_tvshow_on_nfo [tvshows] don't set scraper if we find a tvshow.nfo file. --- xbmc/video/VideoInfoScanner.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/xbmc/video/VideoInfoScanner.cpp b/xbmc/video/VideoInfoScanner.cpp index ed2f43e..07caba2 100644 --- a/xbmc/video/VideoInfoScanner.cpp +++ b/xbmc/video/VideoInfoScanner.cpp @@ -497,13 +497,6 @@ namespace VIDEO // handle .nfo files if (useLocal) result = CheckForNFOFile(pItem, bDirNames, info2, scrUrl); - if (result != CNfoFile::NO_NFO && result != CNfoFile::ERROR_NFO) - { // check for preconfigured scraper; if found, overwrite with interpreted scraper (from Nfofile) - // but keep current scan settings - SScanSettings settings; - if (m_database.GetScraperForPath(pItem->GetPath(), settings)) - m_database.SetScraperForPath(pItem->GetPath(), info2, settings); - } if (result == CNfoFile::FULL_NFO) { pItem->GetVideoInfoTag()->Reset(); -- 2.7.4