From: jmarshallnz <jcmarsha@gmail.com>
Date: Wed, 4 Jun 2014 06:21:49 +0000 (+1200)
Subject: Merge pull request #4676 from jmarshallnz/dont_set_scraper_on_tvshow_on_nfo
X-Git-Tag: 13.2b1-Gotham~32^2~5
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_xbmc;a=commitdiff_plain;h=8d11fbb13289bd595f736eb9200b317fb5bb579c;hp=7b6fa4c7810cd1863bb9b39b23a7a088f354bcae

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.
---

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();