From 1f84dc947048b384b3e3ff8560e6715746efaeea Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sat, 3 Feb 2018 16:01:14 +0100 Subject: [PATCH] fix channellist footer Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bd3933d0059f83d1bd576f5083b51a6c108c988b Author: TangoCash Date: 2018-02-03 (Sat, 03 Feb 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 475c93abd..09b1c4760 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1633,18 +1633,22 @@ void CChannelList::paintDetails(int index) else if (IS_WEBCHAN((*chanlist)[index]->getChannelID())) { g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ OFFSET_INNER_MID, ypos_a + fheight, full_width - 3*OFFSET_INNER_MID, (*chanlist)[index]->getDesc(), colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT, 0, true); } - if (g_settings.channellist_foot == 0 && IS_WEBCHAN((*chanlist)[index]->getChannelID())) { - g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ OFFSET_INNER_MID, ypos_a + 2*fheight + fdescrheight, full_width - 3*OFFSET_INNER_MID, (*chanlist)[index]->getUrl(), COL_MENUCONTENTDARK_TEXT, 0, true); - } else if(g_settings.channellist_foot == 0) { - transponder t; - CServiceManager::getInstance()->GetTransponder((*chanlist)[index]->getTransponderId(), t); - - std::string desc = t.description(); - if((*chanlist)[index]->pname) - desc = desc + " (" + std::string((*chanlist)[index]->pname) + ")"; + if(g_settings.channellist_foot == 0) { + std::string desc = ""; + if (IS_WEBCHAN((*chanlist)[index]->getChannelID())) { + desc = (*chanlist)[index]->getUrl(); + } else - desc = desc + " (" + CServiceManager::getInstance()->GetSatelliteName((*chanlist)[index]->getSatellitePosition()) + ")"; + { + transponder t; + CServiceManager::getInstance()->GetTransponder((*chanlist)[index]->getTransponderId(), t); + desc = t.description(); + if((*chanlist)[index]->pname) + desc = desc + " (" + std::string((*chanlist)[index]->pname) + ")"; + else + desc = desc + " (" + CServiceManager::getInstance()->GetSatelliteName((*chanlist)[index]->getSatellitePosition()) + ")"; + } g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ OFFSET_INNER_MID, ypos_a + 2*fheight +fdescrheight, full_width - 3*OFFSET_INNER_MID, desc.c_str(), COL_MENUCONTENTDARK_TEXT); } else if( !displayNext && g_settings.channellist_foot == 1) { // next Event