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

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c926f1ea91
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-05-07 18:27:59 +02:00
parent 34ad84d6b4 cb07bd9bbc
commit bcc9e29ffe
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/channellist.cpp
View File

@@ -122,7 +122,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
previous_channellist_additional = -1;
eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT;
dline = NULL;
cc_minitv = NULL;
minitv_is_active = false;
headerNew = true;
bouquet = NULL;
@@ -133,6 +133,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
paint_events_index = -2;
CFrameBuffer::getInstance()->OnAfterSetPallette.connect(sigc::mem_fun(this, &CChannelList::ResetModules));
CNeutrinoApp::getInstance()->OnAfterSetupFonts.connect(sigc::mem_fun(this, &CChannelList::ResetModules));
}
CChannelList::~CChannelList()
@@ -952,9 +953,9 @@ void CChannelList::hide()
paint_events(-2); // cancel paint_events thread
if ((g_settings.channellist_additional == 2) || (previous_channellist_additional == 2)) // with miniTV
{
if (cc_minitv)
delete cc_minitv;
cc_minitv = NULL;
if (cc_minitv){
delete cc_minitv; cc_minitv = NULL;
}
}
if(header)
header->kill();
@@ -2162,13 +2163,17 @@ void CChannelList::paintHead()
CComponentsHeader* CChannelList::getHeaderObject()
{
return header;
if (header)
return header;
return NULL;
}
void CChannelList::ResetModules()
{
delete header;
header = NULL;
if (header){
delete header;
header = NULL;
}
if(dline){
delete dline;
dline = NULL;