gui/personalize.cpp: fix memleaks - delete all created CUserMenuSetup

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2163 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2012-03-26 15:27:46 +00:00
parent f515176d41
commit 107d65aafb
2 changed files with 4 additions and 2 deletions

View File

@@ -330,6 +330,8 @@ int CPersonalizeGui::ShowPersonalizationMenu()
delete pinChangeWidget; delete pinChangeWidget;
delete fkeyMenu; delete fkeyMenu;
delete plMenu; delete plMenu;
for(vector<CUserMenuSetup*>::iterator it = v_userMenuSetup.begin(); it != v_userMenuSetup.end(); ++it)
delete *it;
v_userMenuSetup.clear(); v_userMenuSetup.clear();
delete user_menu_notifier; delete user_menu_notifier;
delete pin_setup_notifier; delete pin_setup_notifier;
@@ -374,7 +376,7 @@ void CPersonalizeGui::ShowPreverredKeySetup(CMenuWidget* p_widget)
//init usermenu items //init usermenu items
void CPersonalizeGui::ShowUserMenu(CMenuWidget* p_widget, vector<CUserMenuSetup*> v_umenu) void CPersonalizeGui::ShowUserMenu(CMenuWidget* p_widget, vector<CUserMenuSetup*> &v_umenu)
{ {
p_widget->addIntroItems(LOCALE_USERMENU_HEAD); p_widget->addIntroItems(LOCALE_USERMENU_HEAD);

View File

@@ -162,7 +162,7 @@ class CPersonalizeGui : public CMenuTarget, public CChangeObserver, public CPINP
void ShowMenuOptions(const int& menu); void ShowMenuOptions(const int& menu);
void ShowHelpPersonalize(); void ShowHelpPersonalize();
void ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget); void ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget);
void ShowUserMenu(CMenuWidget* p_widget, std::vector<CUserMenuSetup*> v_umenu); void ShowUserMenu(CMenuWidget* p_widget, std::vector<CUserMenuSetup*> &v_umenu);
void ShowPluginMenu(CMenuWidget* p_widget); void ShowPluginMenu(CMenuWidget* p_widget);
void ShowPreverredKeySetup(CMenuWidget* p_widget); void ShowPreverredKeySetup(CMenuWidget* p_widget);
void SaveAndExit(); void SaveAndExit();