mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/gui/mediaplayer.cpp: fix memleaks when using CMenuForwarder

Browse Source
This commit is contained in:
satbaby
2012-11-20 13:21:33 +01:00
parent 8131a25af1
commit ed8734e2b9
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/mediaplayer.cpp
View File

@@ -141,7 +141,9 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p)
CMenuForwarder *fw_inet = NULL; CMenuForwarder *fw_inet = NULL;
CMenuForwarder *fw_mp = NULL; CMenuForwarder *fw_mp = NULL;
CMenuForwarder *fw_pviewer = NULL; CMenuForwarder *fw_pviewer = NULL;
CPictureViewerGui *pictureviewergui = NULL;
#if ENABLE_UPNP #if ENABLE_UPNP
CUpnpBrowserGui *upnpbrowsergui = NULL;
CMenuForwarder *fw_upnp = NULL; CMenuForwarder *fw_upnp = NULL;
#endif #endif
CMenuWidget *moviePlayer = NULL; CMenuWidget *moviePlayer = NULL;
@@ -170,11 +172,13 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p)
fw_mp->setHint(NEUTRINO_ICON_HINT_MOVIE, LOCALE_MENU_HINT_MOVIE); fw_mp->setHint(NEUTRINO_ICON_HINT_MOVIE, LOCALE_MENU_HINT_MOVIE);
//pictureviewer //pictureviewer
fw_pviewer = new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, new CPictureViewerGui(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); pictureviewergui = new CPictureViewerGui();
fw_pviewer = new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, pictureviewergui, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
fw_pviewer->setHint(NEUTRINO_ICON_HINT_PICVIEW, LOCALE_MENU_HINT_PICVIEW); fw_pviewer->setHint(NEUTRINO_ICON_HINT_PICVIEW, LOCALE_MENU_HINT_PICVIEW);
#if ENABLE_UPNP #if ENABLE_UPNP
//upnp browser //upnp browser
fw_upnp = new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, new CUpnpBrowserGui(), NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0); upnpbrowsergui = new CUpnpBrowserGui();
fw_upnp = new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, upnpbrowsergui, NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0);
#endif #endif
// media->addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, usage_mode == MODE_AUDIO ? CMenuWidget::BTN_TYPE_CANCEL : CMenuWidget::BTN_TYPE_BACK); // media->addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, usage_mode == MODE_AUDIO ? CMenuWidget::BTN_TYPE_CANCEL : CMenuWidget::BTN_TYPE_BACK);
} }
@@ -221,6 +225,10 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p)
res = media->exec(NULL, ""); res = media->exec(NULL, "");
delete media; delete media;
delete personalize; delete personalize;
delete pictureviewergui;
#if ENABLE_UPNP
delete upnpbrowsergui;
#endif
setUsageMode();//set default usage_mode setUsageMode();//set default usage_mode
} }