Merge pull request #4676 from jmarshallnz/dont_set_scraper_on_tvshow_on_nfo
authorjmarshallnz <jcmarsha@gmail.com>
Wed, 4 Jun 2014 06:21:49 +0000 (18:21 +1200)
committerTrent Nelson <trent.nelson@pivosgroup.com>
Sat, 7 Jun 2014 05:57:50 +0000 (13:57 +0800)
commit8d11fbb13289bd595f736eb9200b317fb5bb579c
treeedb3d58f2f7084af1255f660b1fa4fb43736aa78
parent7b6fa4c7810cd1863bb9b39b23a7a088f354bcae
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