diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 426eb0166..e2c05c29b 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -416,7 +416,7 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey) scansettings.scan_nit_manual = 1; scansettings.scan_fta_flag = 0; if (scansettings.scan_logical_numbers) { - g_settings.keep_channel_numbers = 1; + //g_settings.keep_channel_numbers = 1; CServiceManager::getInstance()->KeepNumbers(g_settings.keep_channel_numbers); } CScanTs scanTs(ALL_CABLE); @@ -460,7 +460,7 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey) scansettings.fst_version = CServiceScan::getInstance()->GetFstVersion(); #endif if (as == "fast") { - scansettings.fst_update = 1; + //scansettings.fst_update = 1; if (is_wizard) return menu_return::RETURN_EXIT_ALL; } @@ -1478,7 +1478,8 @@ void CScanSetup::addScanMenuFastScan(CMenuWidget *fast_ScanMenu) mf->setHint("", LOCALE_MENU_HINT_SCAN_FASTDISEQC); fast_ScanMenu->addItem(mf); - if (!g_settings.easymenu) { + if (1 /* !g_settings.easymenu */) + { mf = new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "sfast", CRCInput::RC_blue); mf->setHint("", LOCALE_MENU_HINT_SCAN_START); fast_ScanMenu->addItem(mf); @@ -1607,7 +1608,7 @@ void CScanSetup::addScanMenuCable(CMenuWidget *menu) menu->addItem(Rate); menu->addItem(mod); - CMenuOptionChooser *lcn = new CMenuOptionChooser(LOCALE_SATSETUP_LOGICAL_NUMBERS, (int *)&scansettings.scan_logical_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this, CRCInput::convertDigitToKey(shortCut++)); + CMenuOptionChooser *lcn = new CMenuOptionChooser(LOCALE_SATSETUP_LOGICAL_NUMBERS, (int *)&scansettings.scan_logical_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.keep_channel_numbers, this, CRCInput::convertDigitToKey(shortCut++)); lcn->setHint("", LOCALE_MENU_HINT_SCAN_LOGICAL); menu->addItem(lcn);