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

Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++

Browse Source 
Origin commit data
------------------
Commit: b15a335144
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
This commit is contained in:
[CST] Focus
2012-06-18 20:04:58 +04:00
parent 8dab654920 573e95478e
commit 453fa4459b
9 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/scan_setup.cpp
View File

@@ -618,7 +618,7 @@ void CScanSetup::fillSatSelect()
if(CFEManager::getInstance()->getMode() != CFEManager::FE_MODE_ALONE)
break;
}
if(!sfound && satpos.size()) {
if(!sfound && !satpos.empty()) {
tmpit = satpos.begin();
std::string satname = CServiceManager::getInstance()->GetSatelliteName(*tmpit);
snprintf(scansettings.satNameNoDiseqc, sizeof(scansettings.satNameNoDiseqc), "%s", satname.c_str());
@@ -649,7 +649,7 @@ void CScanSetup::fillCableSelect()
dprintf(DEBUG_DEBUG, "got scanprovider (cable): %s\n", sit->second.name.c_str());
}
if (!sfound && satmap.size()) {
if (!sfound && !satmap.empty()) {
sat_iterator_t sit = satmap.begin();
snprintf(scansettings.satNameNoDiseqc, sizeof(scansettings.satNameNoDiseqc), "%s", sit->second.name.c_str());
}
@@ -678,7 +678,7 @@ int CScanSetup::showScanMenuSatFind()
feSatSelect->addOption(satname.c_str());
if (!sfound && strcmp(scansettings.satNameNoDiseqc, satname.c_str()) == 0)
sfound = true;
if (!sfound && !firstname.size())
if (!sfound && firstname.empty())
firstname = satname;
count++;
}