Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2016-11-12 18:06:26 +01:00
58 changed files with 6498 additions and 735 deletions

View File

@@ -1998,7 +1998,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
if(channel)
CServiceManager::getInstance()->GetTransponder(channel->getTransponderId(), ct);
int i = 0;
int i = menu.getItemsCount();
transponder_list_t &select_transponders = CServiceManager::getInstance()->GetSatelliteTransponders(position);
for (transponder_list_t::iterator tI = select_transponders.begin(); tI != select_transponders.end(); ++tI) {
sprintf(cnt, "%d", i);