mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
Merge branch 'master' into pu/mp
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:
@@ -127,10 +127,6 @@ CEpgData::CEpgData()
|
||||
mp_movie_info = NULL;
|
||||
header = NULL;
|
||||
Bottombox = NULL;
|
||||
lpic = NULL;
|
||||
rpic = NULL;
|
||||
lText = NULL;
|
||||
rText = NULL;
|
||||
pb = NULL;
|
||||
font_title = NULL;
|
||||
}
|
||||
@@ -1524,9 +1520,6 @@ void CEpgData::ResetModules()
|
||||
}
|
||||
if (Bottombox){
|
||||
delete Bottombox; Bottombox = NULL;
|
||||
// bottom box items are destroyed but explicit reset of bottom box items here required
|
||||
lpic = rpic = NULL;
|
||||
lText = rText = NULL;
|
||||
}
|
||||
if (pb){
|
||||
delete pb; pb = NULL;
|
||||
|
Reference in New Issue
Block a user