diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp index b6483b232..482a34f2f 100644 --- a/src/gui/audio_setup.cpp +++ b/src/gui/audio_setup.cpp @@ -191,7 +191,6 @@ int CAudioSetup::showAudioSetup() #endif int res = audioSettings->exec(NULL, ""); - audioSettings->hide(); selected = audioSettings->getSelected(); delete audioSettings; return res; diff --git a/src/gui/audioplayer_setup.cpp b/src/gui/audioplayer_setup.cpp index ff41f6b1d..597bee4e0 100644 --- a/src/gui/audioplayer_setup.cpp +++ b/src/gui/audioplayer_setup.cpp @@ -119,7 +119,6 @@ int CAudioPlayerSetup::showAudioPlayerSetup() audioplayerSetup->addItem(new CMenuOptionChooser(LOCALE_AUDIOPLAYER_ENABLE_SC_METADATA, &g_settings.audioplayer_enable_sc_metadata, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true )); int res = audioplayerSetup->exec (NULL, ""); - audioplayerSetup->hide (); delete audioplayerSetup; return res; } diff --git a/src/gui/cec_setup.cpp b/src/gui/cec_setup.cpp index 7b7de137a..e6f829ed1 100644 --- a/src/gui/cec_setup.cpp +++ b/src/gui/cec_setup.cpp @@ -99,7 +99,6 @@ int CCECSetup::showMenu() cec->addItem(cec2); int res = cec->exec(NULL, ""); - cec->hide(); delete cec; return res; diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp index 70cbd7aa5..b5af0e710 100644 --- a/src/gui/info_menue.cpp +++ b/src/gui/info_menue.cpp @@ -78,7 +78,6 @@ int CInfoMenu::showMenu() info->addItem(new CMenuForwarder(LOCALE_STREAMINFO_HEAD, true, NULL, &streaminfo, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); int res = info->exec(NULL, ""); - info->hide(); delete info; return res; } diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index c7e62363c..be5c504ff 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -230,7 +230,6 @@ int CKeybindSetup::showKeySetup() keySettings->addItem(new CMenuForwarder(LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC, true, g_settings.repeat_genericblocker, &keySettings_repeat_genericblocker)); int res = keySettings->exec(NULL, ""); - keySettings->hide(); //check if rc hardware selection has changed before leaving the menu if (org_remote_control_hardware != g_settings.remote_control_hardware) { diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp index adcb33ca4..f6280805f 100644 --- a/src/gui/mediaplayer.cpp +++ b/src/gui/mediaplayer.cpp @@ -227,7 +227,6 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) personalize->addPersonalizedItems(); res = media->exec(NULL, ""); - media->hide(); delete media; delete personalize; diff --git a/src/gui/mediaplayer_setup.cpp b/src/gui/mediaplayer_setup.cpp index 16954473b..fe48d6646 100644 --- a/src/gui/mediaplayer_setup.cpp +++ b/src/gui/mediaplayer_setup.cpp @@ -95,7 +95,6 @@ int CMediaPlayerSetup::showMediaPlayerSetup() mediaSetup->addItem(new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, &asetup, "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); int res = mediaSetup->exec (NULL, ""); - mediaSetup->hide (); selected = mediaSetup->getSelected(); delete mediaSetup; return res; diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index eea19106a..9c0d80f74 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -212,7 +212,6 @@ int CMiscMenue::showMiscSettingsMenu() #endif /*CPU_FREQ*/ int res = misc_menue.exec(NULL, ""); - misc_menue.hide(); delete fanNotifier; delete sectionsdConfigNotifier; return res; diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index c4a2ca7a3..669f52aac 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -325,7 +325,6 @@ int CNetworkSetup::showNetworkSetup() while(true) { int res = menu_return::RETURN_EXIT; ret = networkSettings->exec(NULL, ""); - networkSettings->hide(); if (settingsChanged()) res = saveChangesDialog(); diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index f93dd8fc6..a7fff2928 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -444,7 +444,6 @@ int COsdSetup::showOsdSetup() osd_menu->addItem(new CMenuOptionChooser(LOCALE_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); int res = osd_menu->exec(NULL, ""); - osd_menu->hide(); delete osd_menu; delete radiotextNotifier; @@ -709,7 +708,6 @@ int COsdSetup::showContextChanlistMenu() #endif int res = menu_chanlist->exec(NULL, ""); - menu_chanlist->hide(); cselected = menu_chanlist->getSelected(); delete menu_chanlist; return res; diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp index 7ba7cfd2d..917b3762d 100644 --- a/src/gui/osdlang_setup.cpp +++ b/src/gui/osdlang_setup.cpp @@ -105,7 +105,6 @@ int COsdLangSetup::showLocalSetup() //langNotifier->changeNotify(NONEXISTANT_LOCALE, NULL); int res = localSettings->exec(NULL, ""); - localSettings->hide(); delete localSettings; delete langNotifier; return res; diff --git a/src/gui/parentallock_setup.cpp b/src/gui/parentallock_setup.cpp index c624c048f..a4b6981c8 100644 --- a/src/gui/parentallock_setup.cpp +++ b/src/gui/parentallock_setup.cpp @@ -107,6 +107,5 @@ void CParentalSetup::showParentalSetup() plock->addItem( new CMenuForwarder(LOCALE_PARENTALLOCK_CHANGEPIN, true, g_settings.parentallock_pincode, &pinChangeWidget)); plock->exec(NULL, ""); - plock->hide(); delete plock; } diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp index c9c21efd1..cbcc62758 100644 --- a/src/gui/personalize.cpp +++ b/src/gui/personalize.cpp @@ -324,7 +324,6 @@ int CPersonalizeGui::ShowPersonalizationMenu() pMenu->addItem(new CMenuForwarder(LOCALE_PERSONALIZE_HELP, true, NULL, this, "personalize_help", CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP)); int res = pMenu->exec(NULL, ""); - pMenu->hide(); delete pMenu; delete uMenu; delete pinChangeWidget; @@ -517,7 +516,6 @@ int CPersonalizeGui::ShowMenuOptions(const int& widget) } options_count = pm->getItemsCount(); int res = pm->exec (NULL, ""); - pm->hide (); delete pm; return res; } diff --git a/src/gui/pictureviewer_setup.cpp b/src/gui/pictureviewer_setup.cpp index 2a4e6078b..63c68856c 100644 --- a/src/gui/pictureviewer_setup.cpp +++ b/src/gui/pictureviewer_setup.cpp @@ -111,7 +111,6 @@ int CPictureViewerSetup::showPictureViewerSetup() picviewsetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_DEFDIR, true, g_settings.network_nfs_picturedir, this, "picturedir")); int res = picviewsetup->exec(NULL, ""); - picviewsetup->hide(); delete picviewsetup; return res; } diff --git a/src/gui/proxyserver_setup.cpp b/src/gui/proxyserver_setup.cpp index 38639500a..55b98bb70 100644 --- a/src/gui/proxyserver_setup.cpp +++ b/src/gui/proxyserver_setup.cpp @@ -90,7 +90,6 @@ int CProxySetup::showProxySetup() mn->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYPASSWORD, true, g_settings.softupdate_proxypassword, &softUpdate_proxypass, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); int res = mn->exec(NULL, ""); - mn->hide(); delete mn; return res; } diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp index 840c2af1f..71863c128 100644 --- a/src/gui/record_setup.cpp +++ b/src/gui/record_setup.cpp @@ -214,7 +214,6 @@ int CRecordSetup::showRecordSetup() recordingSettings->addItem(new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS, true, NULL, &recordingaAudioSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); int res = recordingSettings->exec(NULL, ""); - recordingSettings->hide(); delete recordingSettings; delete RecordingSafetyNotifier; delete APIDNotifier; diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 25d199513..28862440b 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -409,7 +409,6 @@ int CScanSetup::showScanMenu() } int res = settings->exec(NULL, ""); - settings->hide(); //delete satSelect; delete satOnOff; @@ -517,7 +516,6 @@ int CScanSetup::showFrontendSetup(int number) setupMenu->addItem(new CMenuForwarder(LOCALE_MOTORCONTROL_HEAD, true, NULL, this, "satfind", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); int res = setupMenu->exec(NULL, ""); - setupMenu->hide(); feselected = setupMenu->getSelected(); /* add configured satellites to satSelect in case they changed */ @@ -569,7 +567,6 @@ int CScanSetup::showScanMenuLnbSetup() } if(count) { res = sat_setup->exec(NULL, ""); - sat_setup->hide(); for (int i = 0; i < count; i++) delete tmp[i]; } @@ -686,7 +683,6 @@ int CScanSetup::showScanMenuSatFind() sat_findMenu->addItem(new CMenuForwarder(LOCALE_MOTORCONTROL_HEAD, allow_start, NULL, &mcontrol, "", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); int res = sat_findMenu->exec(NULL, ""); - sat_findMenu->hide(); delete sat_findMenu; return res; } diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp index 1b7c4cf94..bc30f6349 100644 --- a/src/gui/settings_manager.cpp +++ b/src/gui/settings_manager.cpp @@ -161,7 +161,6 @@ int CSettingsManager::showMenu() mset->addItem(new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER)); int res = mset->exec(NULL, ""); - mset->hide(); delete resetNotifier; delete mset; return res; diff --git a/src/gui/sleeptimer.cpp b/src/gui/sleeptimer.cpp index a15eac04b..be0c70d32 100644 --- a/src/gui/sleeptimer.cpp +++ b/src/gui/sleeptimer.cpp @@ -84,7 +84,6 @@ int CSleepTimerWidget::exec(CMenuTarget* parent, const std::string &actionKey) } int ret = inbox->exec (NULL, ""); - inbox->hide (); delete inbox; /* exit pressed, cancel timer setup */ diff --git a/src/gui/software_update.cpp b/src/gui/software_update.cpp index 262a3b52d..9c449d3ac 100644 --- a/src/gui/software_update.cpp +++ b/src/gui/software_update.cpp @@ -114,7 +114,6 @@ int CSoftwareUpdate::showSoftwareUpdate() softUpdate->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE, true, NULL, &flash, "", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW )); int res = softUpdate->exec (NULL, ""); - softUpdate->hide (); delete softUpdate; return res; } diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp index 6620933d6..e282a3866 100644 --- a/src/gui/test_menu.cpp +++ b/src/gui/test_menu.cpp @@ -334,7 +334,6 @@ void CTestMenu::showTestMenu() //TestMenu->addItem(new CMenuForwarderNonLocalized("22 Khz OFF", true, NULL, this, "22koff")); TestMenu->exec(NULL, ""); - TestMenu->hide(); selected = TestMenu->getSelected(); delete TestMenu; } diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index 84026eee6..176f85a5d 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -174,7 +174,6 @@ int CThemes::Show() } int res = themes.exec(NULL, ""); - themes.hide(); if (file_name.length() > 1) { saveFile((char*)((std::string)USERDIR + file_name + FILE_PREFIX).c_str()); diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index d43b0a4b6..85e510544 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -134,7 +134,6 @@ int CUserMenuSetup::showSetup() } int res = ums->exec(NULL, ""); - ums->hide(); return res; } diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp index b78ad01a0..420368cb1 100644 --- a/src/gui/vfd_setup.cpp +++ b/src/gui/vfd_setup.cpp @@ -135,8 +135,7 @@ int CVfdSetup::showSetup() vfds->addItem(lcd_clock_channelname_menu); int res = vfds->exec(NULL, ""); - vfds->hide(); - + delete vfds; return res; } diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 835953af3..ce18166f6 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -243,7 +243,6 @@ int CVideoSettings::showVideoSetup() videosetup->addItem(vs_videomodes_fw); //video modes submenue int res = videosetup->exec(NULL, ""); - videosetup->hide(); selected = videosetup->getSelected(); delete videosetup; return res; diff --git a/src/gui/zapit_setup.cpp b/src/gui/zapit_setup.cpp index 040ddcf01..80ccc3e66 100644 --- a/src/gui/zapit_setup.cpp +++ b/src/gui/zapit_setup.cpp @@ -75,7 +75,6 @@ void CZapitSetup::showMenu() zapit->addItem(zapit2 = new CMenuForwarder(LOCALE_ZAPITSETUP_LAST_RADIO , !g_settings.uselastchannel, g_settings.StartChannelRadio, &select, "radio", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW )); zapit->exec(NULL, ""); - zapit->hide(); delete zapit; } @@ -175,7 +174,6 @@ void CSelectChannelWidget::InitZapitChannelHelper(CZapitClient::channelsMode mod } } mctv.exec (NULL, ""); - mctv.hide (); // delete dynamic created objects for(unsigned int count=0;count