diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 9f0e341be..0a48e714f 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -1454,7 +1454,7 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey ) inst->GetRecordString(title, duration); title += duration; tostart = (ShowMsg(LOCALE_RECORDING_IS_RUNNING, title.c_str(), - CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30) == CMsgBox::mbrYes); + CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, DEFAULT_TIMEOUT) == CMsgBox::mbrYes); } //NI if (g_settings.recording_startstop_msg) { diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index aa16acddf..b681e9284 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1535,24 +1535,23 @@ void CChannelList::paintDetails(int index) int ypos = y + height + OFFSET_INTER; int ypos_a = ypos + OFFSET_INNER_SMALL; - CChannelEvent *p_event = NULL; - - //colored_events init - bool colored_event_C = (g_settings.theme.colored_events_channellist == 1); - bool colored_event_N = (g_settings.theme.colored_events_channellist == 2); - frameBuffer->paintBoxRel(x, ypos, full_width, info_height, COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE); frameBuffer->paintBoxFrame(x, ypos, full_width, info_height, 1, COL_FRAME_PLUS_0, RADIUS_LARGE); //NI if ((*chanlist).empty()) return; + //colored_events init + bool colored_event_C = (g_settings.theme.colored_events_channellist == 1); + bool colored_event_N = (g_settings.theme.colored_events_channellist == 2); + + CChannelEvent *p_event = NULL; if (displayNext) p_event = &(*chanlist)[index]->nextEvent; else p_event = &(*chanlist)[index]->currentEvent; - if (/* !IS_WEBTV((*chanlist)[index]->getChannelID()) && */ !p_event->description.empty()) { + if (/* !IS_WEBTV((*chanlist)[index]->getChannelID()) && */ p_event && !p_event->description.empty()) { char cNoch[50] = {0}; // UTF-8 char cSeit[50] = {0}; // UTF-8 @@ -1619,7 +1618,7 @@ void CChannelList::paintDetails(int index) else if (IS_WEBTV((*chanlist)[index]->getChannelID())) { g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, ypos_a + fheight, full_width - 30, (*chanlist)[index]->getDesc(), colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT, 0, true); } - if (IS_WEBTV((*chanlist)[index]->getChannelID())) { + if (g_settings.channellist_foot == 0 && IS_WEBTV((*chanlist)[index]->getChannelID())) { g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, ypos_a + 2*fheight + fdescrheight, full_width - 30, (*chanlist)[index]->getUrl(), COL_MENUCONTENTDARK_TEXT, 0, true); } else if(g_settings.channellist_foot == 0) { transponder t; @@ -1636,7 +1635,7 @@ void CChannelList::paintDetails(int index) else if( !displayNext && g_settings.channellist_foot == 1) { // next Event CSectionsdClient::CurrentNextInfo CurrentNext; - CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->getChannelID(), CurrentNext); + CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->getEpgID(), CurrentNext); if (!CurrentNext.next_name.empty()) { char buf[128] = {0}; char cFrom[50] = {0}; // UTF-8 diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index 52728f3c1..2439f57ed 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -197,7 +197,7 @@ int CHintBox::exec() neutrino_msg_data_t data; int res = messages_return::none; - if (timeout == NO_TIMEOUT || timeout == 0) + if (timeout == NO_TIMEOUT || timeout == DEFAULT_TIMEOUT) timeout = HINTBOX_DEFAULT_TIMEOUT; uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout ); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 83799f34d..804ecc50e 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3727,7 +3727,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode) if(CRecordManager::getInstance()->RecordingStatus() || cYTCache::getInstance()->isActive()) { do_shutdown = (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_SHUTDOWN_RECORDING_QUERY, CMsgBox::mbrNo, - CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30, true) == CMsgBox::mbrYes); + CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, DEFAULT_TIMEOUT, true) == CMsgBox::mbrYes); } if(do_shutdown) {