From 70725b323b6e5d580759bd1c42492bd78e87cfbc Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Tue, 5 Nov 2013 15:33:12 +0400 Subject: [PATCH] gui/scan_setup.cpp: do not add satellites to select from disabled frontend; add intro items for scan menu not dependent on wizard mode: after wizard mode disabled, code add one more item (subhead), and saved selected invalidated, as result ie no selected item at all --- src/gui/scan_setup.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 701a82bbc..5bbe9e787 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -374,11 +374,11 @@ int CScanSetup::showScanMenu() allow_start = !CRecordManager::getInstance()->RecordingStatus() || CRecordManager::getInstance()->TimeshiftOnly(); //main - CMenuWidget * settings = new CMenuWidget(is_wizard ? LOCALE_SERVICEMENU_SCANTS : LOCALE_SERVICEMENU_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_SCAN_MAIN); + CMenuWidget * settings = new CMenuWidget(/*is_wizard ? LOCALE_SERVICEMENU_SCANTS :*/ LOCALE_SERVICEMENU_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_SCAN_MAIN); settings->setWizardMode(is_wizard); //back - settings->addIntroItems(is_wizard ? NONEXISTANT_LOCALE : LOCALE_SERVICEMENU_SCANTS); + settings->addIntroItems(/*is_wizard ? NONEXISTANT_LOCALE : */ LOCALE_SERVICEMENU_SCANTS); //---------------------------------------------------------------------- #if 0 //save scan settings @@ -877,7 +877,7 @@ void CScanSetup::fillSatSelect(CMenuOptionStringChooser * select) for(int i = 0; i < count; i++) { CFrontend * fe = CFEManager::getInstance()->getFE(i); - if (fe->getInfo()->type != FE_QPSK) + if ((fe->getInfo()->type != FE_QPSK) || (fe->getMode() == CFrontend::FE_MODE_UNUSED)) continue; satellite_map_t & satmap = fe->getSatellites();