Merge branch 'master' into pu/mp

Origin commit data
------------------
Commit: f791ee1455
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-02 (Sun, 02 Jul 2017)
This commit is contained in:
Jacek Jendrzej
2017-07-02 17:22:23 +02:00
8 changed files with 35 additions and 23 deletions

View File

@@ -3449,7 +3449,9 @@ bool CMovieBrowser::showMenu(bool calledExternally)
if (!calledExternally) {
CMenuWidget mainMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER);
mainMenu.addIntroItems(LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD);
mainMenu.addItem(new CMenuForwarder(m_movieSelectionHandler->epgTitle, false));
if (m_movieSelectionHandler){
mainMenu.addItem(new CMenuForwarder(m_movieSelectionHandler->epgTitle, false));
}
mainMenu.addItem(GenericMenuSeparator);
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_HEAD, (m_movieSelectionHandler != NULL), NULL, this, "show_movie_info_menu", CRCInput::RC_red));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_CUT_HEAD, (m_movieSelectionHandler != NULL), NULL, this, "show_movie_cut_menu", CRCInput::RC_green));