mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source
This commit is contained in:
M. Liebmann
2017-03-02 23:38:19 +01:00
parent 02e5c9cbf4 9fe20399c4
commit 6c3b5dcd93
33 changed files with 254 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/infoviewer.cpp
View File

@@ -2169,9 +2169,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();
@@ -2381,7 +2385,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;