Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f1cfd42bb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-03-07 19:43:06 +01:00
54 changed files with 216 additions and 51 deletions

View File

@@ -70,7 +70,7 @@ std::string cYTCache::getName(MI_MOVIE_INFO *mi, std::string ext)
case MI_MOVIE_INFO::NK:
return g_settings.downloadcache_dir + "/nk-" + mi->ytid + "." + ext;
default:
return "";
return g_settings.downloadcache_dir + "/error-" + mi->ytid + "." + ext;;
}
}