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

Merge branch 'pu/mp' of github.com:tuxbox-neutrino/gui-neutrino into pu/mp

Browse Source 
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp
This commit is contained in:
TangoCash
2017-03-15 22:47:42 +01:00
parent cf126eb761 f974b56343
commit 81fb3b42fa
6 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/scan_setup.cpp
View File

@@ -1334,7 +1334,6 @@ int CScanSetup::showScanMenuSatFind()
//init tempsat menu
void CScanSetup::addScanMenuTempSat(CMenuWidget *temp_sat, sat_config_t & satconfig)
{
bool unicable = (dmode == DISEQC_UNICABLE ? true : dmode == DISEQC_UNICABLE2);
temp_sat->addIntroItems();
CMenuOptionNumberChooser *diseqc = NULL;
@@ -1344,6 +1343,7 @@ void CScanSetup::addScanMenuTempSat(CMenuWidget *temp_sat, sat_config_t & satcon
CMenuOptionNumberChooser *motor = NULL;
CMenuOptionChooser *usals = NULL;
CMenuForwarder *mf;
bool unicable = (dmode == DISEQC_UNICABLE ? true : dmode == DISEQC_UNICABLE2);
if (!unicable) {
diseqc = new CMenuOptionNumberChooser(LOCALE_SATSETUP_DISEQC_INPUT, &satconfig.diseqc, ((dmode != NO_DISEQC) && (dmode != DISEQC_ADVANCED)), -1, 15, this, CRCInput::RC_nokey, NULL, 1, -1, LOCALE_OPTIONS_OFF);