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 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-03 10:38:14 +01:00
parent 0e588328e0 7d68b0c284
commit 3d3e8163b8
18 changed files with 160 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/infoviewer.cpp
View File

@@ -2254,9 +2254,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();
@@ -2568,7 +2572,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;