Merge branch 'master' into svgtemplates

This commit is contained in:
louis
2015-06-13 15:50:38 +02:00
13 changed files with 121 additions and 95 deletions

View File

@@ -150,11 +150,12 @@ bool cImageCache::LogoExists(string channelID) {
if (!channel)
return false;
string logoLower = StrToLowerCase(channel->Name());
string channelIDLower = StrToLowerCase(channelID.c_str());
return (FileExists(logoPath.c_str(), logoLower, "svg") ||
FileExists(logoPath.c_str(), logoLower, "png") ||
FileExists(logoPath.c_str(), channelID, "svg") ||
FileExists(logoPath.c_str(), channelID, "png"));
FileExists(logoPath.c_str(), channelIDLower, "svg") ||
FileExists(logoPath.c_str(), channelIDLower, "png"));
}
bool cImageCache::SeparatorLogoExists(string name) {