tryfix scan frontend selection

Origin commit data
------------------
Commit: c1bca3fbc5
Author: TangoCash <eric@loxat.de>
Date: 2017-12-10 (Sun, 10 Dec 2017)
This commit is contained in:
TangoCash
2017-12-10 09:18:55 +01:00
committed by vanhofen
parent 4b105f18b7
commit 2499e106a8

View File

@@ -728,15 +728,20 @@ bool CFEManager::canTune(CZapitChannel * channel)
CFrontend * CFEManager::getScanFrontend(t_satellite_position satellitePosition) CFrontend * CFEManager::getScanFrontend(t_satellite_position satellitePosition)
{ {
delivery_system_t delsys = UNKNOWN_DS;
if (SAT_POSITION_CABLE(satellitePosition))
delsys = ALL_CABLE;
if (SAT_POSITION_TERR(satellitePosition))
delsys = ALL_TERR;
CFrontend * frontend = NULL; CFrontend * frontend = NULL;
for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) { for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) {
CFrontend * mfe = it->second; CFrontend * mfe = it->second;
if (mfe->hasCable() && SAT_POSITION_CABLE(satellitePosition)) { if (mfe->hasCable() && SAT_POSITION_CABLE(satellitePosition) && !mfe->forcedDelivery(delsys)) {
if (mfe->getMode() != CFrontend::FE_MODE_UNUSED) { if (mfe->getMode() != CFrontend::FE_MODE_UNUSED) {
frontend = mfe; frontend = mfe;
break; break;
} }
} else if (mfe->hasTerr() && SAT_POSITION_TERR(satellitePosition)) { } else if (mfe->hasTerr() && SAT_POSITION_TERR(satellitePosition) && !mfe->forcedDelivery(delsys)) {
if (mfe->getMode() != CFrontend::FE_MODE_UNUSED) { if (mfe->getMode() != CFrontend::FE_MODE_UNUSED) {
frontend = mfe; frontend = mfe;
break; break;