epgview: rework CEPGDataHandler::exec() to get work in movieplayer-mode too

Origin commit data
------------------
Branch: ni/coolstream
Commit: 3dc2c47e9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-22 (Sun, 22 Jul 2018)

Origin message was:
------------------
- epgview: rework CEPGDataHandler::exec() to get work in movieplayer-mode too

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-07-22 23:27:23 +02:00
parent c1216df34f
commit 7f1ed1eb40

View File

@@ -1729,20 +1729,22 @@ void CEpgData::ResetModules()
int CEPGDataHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/)
{
int res = menu_return::RETURN_EXIT_ALL;
CChannelList *channelList;
CEpgData *e;
int res = menu_return::RETURN_EXIT_ALL;
if (parent) {
if (parent)
parent->hide();
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_ts)
{
CMoviePlayerGui::getInstance().showMovieInfo();
}
else
{
CEpgData *e;
e = new CEpgData;
e->show(CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID());
delete e;
}
e = new CEpgData;
channelList = CNeutrinoApp::getInstance()->channelList;
e->show( channelList->getActiveChannel_ChannelID() );
delete e;
return res;
}