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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
This commit is contained in:
vanhofen
2016-11-02 09:50:10 +01:00
parent 280b559852 e2c1dbc75b
commit dbfd2214db
50 changed files with 5794 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/scan_setup.cpp
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);