mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 16:31:11 +02:00
gui/osd_setup.cpp, gui/miscsettings_menu.cpp: do not delete items added to menu - menu dtor do it
This commit is contained in:
@@ -73,26 +73,6 @@ CMiscMenue::CMiscMenue()
|
|||||||
|
|
||||||
CMiscMenue::~CMiscMenue()
|
CMiscMenue::~CMiscMenue()
|
||||||
{
|
{
|
||||||
if (epg_save) {
|
|
||||||
delete epg_save;
|
|
||||||
epg_save = NULL;
|
|
||||||
}
|
|
||||||
if (epg_save_standby) {
|
|
||||||
delete epg_save_standby;
|
|
||||||
epg_save_standby = NULL;
|
|
||||||
}
|
|
||||||
if (epg_save_frequently) {
|
|
||||||
delete epg_save_frequently;
|
|
||||||
epg_save_frequently = NULL;
|
|
||||||
}
|
|
||||||
if (epg_read) {
|
|
||||||
delete epg_read;
|
|
||||||
epg_read = NULL;
|
|
||||||
}
|
|
||||||
if (epg_dir) {
|
|
||||||
delete epg_dir;
|
|
||||||
epg_dir = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
|
int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
|
||||||
|
@@ -95,14 +95,6 @@ COsdSetup::COsdSetup(int wizard_mode)
|
|||||||
|
|
||||||
COsdSetup::~COsdSetup()
|
COsdSetup::~COsdSetup()
|
||||||
{
|
{
|
||||||
if (ca_dotmatrix) {
|
|
||||||
delete ca_dotmatrix;
|
|
||||||
ca_dotmatrix = NULL;
|
|
||||||
}
|
|
||||||
if (ca_frame) {
|
|
||||||
delete ca_frame;
|
|
||||||
ca_frame = NULL;
|
|
||||||
}
|
|
||||||
delete colorSetupNotifier;
|
delete colorSetupNotifier;
|
||||||
delete fontsizenotifier;
|
delete fontsizenotifier;
|
||||||
delete win_demo;
|
delete win_demo;
|
||||||
|
Reference in New Issue
Block a user