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

src/gui/epgview.cpp:check res after exec

Browse Source
This commit is contained in:
satbaby
2012-11-02 22:00:01 +01:00
parent 618fa78a5a
commit c40361147d
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/epgview.cpp
View File

@@ -674,10 +674,10 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
if ( doLoop ) if ( doLoop )
{ {
neutrino_msg_t msg; neutrino_msg_t msg = 0;
neutrino_msg_data_t data; neutrino_msg_data_t data = 0;
int scrollCount; int scrollCount = 0;
bool loop = true; bool loop = true;
@@ -849,15 +849,17 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
{ {
if(!followlist.empty()){ if(!followlist.empty()){
hide(); hide();
CNeutrinoEventList *ee; CNeutrinoEventList *ee = new CNeutrinoEventList;
ee = new CNeutrinoEventList; res = ee->exec(channel_id, g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT),"","",followlist); // UTF-8
ee->exec(channel_id, g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT),"","",followlist); // UTF-8
delete ee; delete ee;
if (res == menu_return::RETURN_EXIT_ALL)
loop = false;
else {
if (!bigFonts && g_settings.bigFonts) { if (!bigFonts && g_settings.bigFonts) {
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getSize() * BIG_FONT_FAKTOR)); g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getSize() * BIG_FONT_FAKTOR));
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIG_FONT_FAKTOR)); g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIG_FONT_FAKTOR));
} }
}
bigFonts = g_settings.bigFonts; bigFonts = g_settings.bigFonts;
show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false); show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false);
} }

9
src/gui/eventlist.cpp
View File

@@ -973,16 +973,11 @@ void CNeutrinoEventList::showFunctionBar (bool show, t_channel_id channel_id)
int CEventListHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/) int CEventListHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/)
{ {
int res = menu_return::RETURN_EXIT_ALL; int res = menu_return::RETURN_EXIT_ALL;
CNeutrinoEventList *e;
CChannelList *channelList;
if (parent) { if (parent) {
parent->hide(); parent->hide();
} }
e = new CNeutrinoEventList; CNeutrinoEventList *e = new CNeutrinoEventList;
CChannelList *channelList = CNeutrinoApp::getInstance()->channelList;
channelList = CNeutrinoApp::getInstance()->channelList;
e->exec(CZapit::getInstance()->GetCurrentChannelID(), channelList->getActiveChannelName()); // UTF-8 e->exec(CZapit::getInstance()->GetCurrentChannelID(), channelList->getActiveChannelName()); // UTF-8
delete e; delete e;