mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source 
Origin commit data
------------------
Commit: 8ab1ead149
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-28 (Sun, 28 May 2017)
This commit is contained in:
Thilo Graf
2017-05-28 20:47:45 +02:00
parent cf7c469d8b cea25f1809
commit 8e16f920cd
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/channellist.cpp
View File

@@ -1684,13 +1684,15 @@ void CChannelList::showChannelLogo()
{
if ((*chanlist).empty())
return;
if(g_settings.channellist_show_channellogo){
header->setChannelLogo((*chanlist)[selected]->getChannelID(), (*chanlist)[selected]->getName());
header->getChannelLogoObject()->hide();
header->getChannelLogoObject()->clearSavedScreen();
header->getChannelLogoObject()->allowPaint(true);
header->getChannelLogoObject()->paint();
}
else
header->setChannelLogo(0, string());
}
#define NUM_LIST_BUTTONS_SORT 9
@@ -2150,16 +2152,7 @@ void CChannelList::paintHead()
}
}
if(g_settings.channellist_show_channellogo){
//ensure to have clean background
header->getChannelLogoObject()->hide();
header->setChannelLogo((*chanlist)[selected]->getChannelID(), (*chanlist)[selected]->getName());
header->getChannelLogoObject()->allowPaint(false);
}
else
header->setChannelLogo(0, string());
header->paint(CC_SAVE_SCREEN_NO);
showChannelLogo();
}
CComponentsHeader* CChannelList::getHeaderObject()