From 2499e106a8cefb950fdf3c86e43c3bf35c58d90d Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 10 Dec 2017 09:18:55 +0100 Subject: [PATCH] tryfix scan frontend selection Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/c1bca3fbc586829eb5a737c24e4aec25dc5f3097 Author: TangoCash Date: 2017-12-10 (Sun, 10 Dec 2017) --- src/zapit/src/femanager.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp index 79551b37d..26e37f05c 100644 --- a/src/zapit/src/femanager.cpp +++ b/src/zapit/src/femanager.cpp @@ -728,15 +728,20 @@ bool CFEManager::canTune(CZapitChannel * channel) 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; for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) { 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) { frontend = mfe; 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) { frontend = mfe; break;