mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/src/femanager.cpp: fix save/restore flag to use satellite in multi-satellite scan

Browse Source
This commit is contained in:
[CST] Focus
2015-01-27 13:44:56 +03:00
parent c624505818
commit ae6a5e6917
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/zapit/src/femanager.cpp
View File

@@ -286,7 +286,7 @@ bool CFEManager::loadSettings()
satellite_map_t & satmap = fe->getSatellites(); satellite_map_t & satmap = fe->getSatellites();
satmap.clear(); satmap.clear();
satellite_map_t satlist = CServiceManager::getInstance()->SatelliteList(); satellite_map_t &satlist = CServiceManager::getInstance()->SatelliteList();
for(sat_iterator_t sit = satlist.begin(); sit != satlist.end(); ++sit) for(sat_iterator_t sit = satlist.begin(); sit != satlist.end(); ++sit)
{ {
if (!fe->supportsDelivery(sit->second.delsys)) if (!fe->supportsDelivery(sit->second.delsys))
@@ -314,6 +314,8 @@ bool CFEManager::loadSettings()
if(getSatelliteConfig(fe, satconfig)) if(getSatelliteConfig(fe, satconfig))
satmap[position] = satconfig; // overwrite if exist satmap[position] = satconfig; // overwrite if exist
if (satconfig.use_in_scan)
sit->second.use_in_scan = satconfig.use_in_scan;
} }
} }
@@ -324,6 +326,7 @@ bool CFEManager::loadSettings()
void CFEManager::saveSettings(bool write) void CFEManager::saveSettings(bool write)
{ {
configfile.clear(); configfile.clear();
satellite_map_t &satlist = CServiceManager::getInstance()->SatelliteList();
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 * fe = it->second; CFrontend * fe = it->second;
frontend_config_t & fe_config = fe->getConfig(); frontend_config_t & fe_config = fe->getConfig();
@@ -347,6 +350,9 @@ void CFEManager::saveSettings(bool write)
satellite_map_t satellites = fe->getSatellites(); satellite_map_t satellites = fe->getSatellites();
for(sat_iterator_t sit = satellites.begin(); sit != satellites.end(); ++sit) { for(sat_iterator_t sit = satellites.begin(); sit != satellites.end(); ++sit) {
if (sit->second.configured) { if (sit->second.configured) {
sat_iterator_t tit = satlist.find(sit->first);
if (tit != satlist.end())
sit->second.use_in_scan = tit->second.use_in_scan;
satList.push_back(sit->first); satList.push_back(sit->first);
setSatelliteConfig(fe, sit->second); setSatelliteConfig(fe, sit->second);
} }