From 4281ec9e5aa17c7bd84c4fa0f84c83b401a147e9 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Tue, 3 Sep 2013 11:42:09 +0400 Subject: [PATCH] gui/mediaplayer.cpp: make upnpbrowsergui static Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e2f4eff5984fb110710b9e0a51b6e05dcfb3be4a Author: [CST] Focus Date: 2013-09-03 (Tue, 03 Sep 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/mediaplayer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp index 50e0a72b0..6ff2edbd7 100644 --- a/src/gui/mediaplayer.cpp +++ b/src/gui/mediaplayer.cpp @@ -149,7 +149,7 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) CMenuForwarder *fw_pviewer = NULL; CPictureViewerGui *pictureviewergui = NULL; #if ENABLE_UPNP - CUpnpBrowserGui *upnpbrowsergui = NULL; + static CUpnpBrowserGui *upnpbrowsergui = NULL; CMenuForwarder *fw_upnp = NULL; #endif CMenuWidget *moviePlayer = NULL; @@ -185,7 +185,8 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) fw_pviewer->setHint(NEUTRINO_ICON_HINT_PICVIEW, LOCALE_MENU_HINT_PICVIEW); #if ENABLE_UPNP //upnp browser - upnpbrowsergui = new CUpnpBrowserGui(); + if (!upnpbrowsergui) + upnpbrowsergui = new CUpnpBrowserGui(); fw_upnp = new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, upnpbrowsergui, NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0); #endif // media->addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, usage_mode == MODE_AUDIO ? CMenuWidget::BTN_TYPE_CANCEL : CMenuWidget::BTN_TYPE_BACK); @@ -237,7 +238,7 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) delete personalize; delete pictureviewergui; #if ENABLE_UPNP - delete upnpbrowsergui; + //delete upnpbrowsergui; #endif setUsageMode();//set default usage_mode