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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 506f7acbdd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-16 20:17:27 +01:00
parent 3e693c9047 b74a76d7a5
commit 7ecbfdf325
3 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/channellist.cpp
View File

@@ -975,14 +975,15 @@ int CChannelList::show()
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;
}
header->kill();
if(header)
header->kill();
if (CChannelLogo){
CChannelLogo->kill();
delete CChannelLogo;