Merge remote-tracking branch 'check/next-cc'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-12-29 22:12:09 +01:00
19 changed files with 387 additions and 484 deletions

View File

@@ -1768,7 +1768,7 @@ void CChannelList::paintItem2DetailsLine (int pos)
void CChannelList::showChannelLogo()
{
if(g_settings.infobar_show_channellogo){
if(g_settings.channellist_show_channellogo){
static int logo_w = 0;
static int logo_h = 0;
int logo_w_max = full_width / 4;