mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +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/gui/update.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cd96638c45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-01 18:18:07 +01:00
parent c498527390 9af8ad3e8a
commit 6fb38c77a5
8 changed files with 107 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/infoviewer.cpp
View File

@@ -2253,9 +2253,13 @@ void CInfoViewer::killTitle()
sigbox->kill();
#endif
header->kill();
#if 0 //not really required to kill clock, header does this
#if 1 //not really required to kill clock, header does this <--- really ????
if (clock)
{
clock->kill();
delete clock;
clock = NULL;
}
#endif
body->kill();
@@ -2523,7 +2527,10 @@ void CInfoViewer::ResetModules()
delete header; header = NULL;
delete body; body = NULL;
delete infobar_txt; infobar_txt = NULL;
delete clock; clock = NULL;
if (clock)
{
delete clock; clock = NULL;
}
delete txt_cur_start; txt_cur_start = NULL;
delete txt_cur_event; txt_cur_event = NULL;
delete txt_cur_event_rest; txt_cur_event_rest = NULL;