From 60c45ec06cbfd228d3754d1c9c996849b19437dc Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Fri, 19 Jun 2015 15:48:15 +0300 Subject: [PATCH] gui/osd_setup.cpp, gui/miscsettings_menu.cpp: do not delete items added to menu - menu dtor do it --- src/gui/miscsettings_menu.cpp | 20 -------------------- src/gui/osd_setup.cpp | 8 -------- 2 files changed, 28 deletions(-) diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 8e49bd303..55aca50fc 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -73,26 +73,6 @@ 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) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index a905ae2ec..2b3aa8f64 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -95,14 +95,6 @@ COsdSetup::COsdSetup(int wizard_mode) COsdSetup::~COsdSetup() { - if (ca_dotmatrix) { - delete ca_dotmatrix; - ca_dotmatrix = NULL; - } - if (ca_frame) { - delete ca_frame; - ca_frame = NULL; - } delete colorSetupNotifier; delete fontsizenotifier; delete win_demo;