From 7f1ed1eb40c9254fc85488a6e43bb898d415e867 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 22 Jul 2018 23:27:23 +0200 Subject: [PATCH] epgview: rework CEPGDataHandler::exec() to get work in movieplayer-mode too Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3dc2c47e9dac29b63ef6c0acf8117dae1a14ca45 Author: vanhofen 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 --- src/gui/epgview.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index d32530ea0..0ecd2f31c 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -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; }