From 903fcfa3d45ed9ff72f81f96ef05dba30abc1a5c Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Tue, 23 Mar 2010 14:30:58 +0000 Subject: [PATCH] fixes git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@524 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/08be423e86d5a0860defe7de06acddc5885ecc04 Author: [CST] Focus Date: 2010-03-23 (Tue, 23 Mar 2010) ------------------ This commit was generated by Migit --- src/neutrino_menue.cpp | 4 ++-- src/system/setting_helpers.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 0a5ebd6dd..294ec2475 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -1013,7 +1013,7 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings) int sfound = 0; int dmode = scanSettings.diseqcMode; int shortcut = 1; - int all_usals = 1; + static int all_usals = 1; CTPSelectHandler * tpSelect = new CTPSelectHandler(); @@ -1238,7 +1238,7 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings) settings.addItem(fsatSetup); settings.addItem(fmotorMenu); } - settings.addItem(new CMenuOptionNumberChooser(LOCALE_EXTRA_ZAPIT_TIMEOUT, (int *)&zapitCfg.feTimeout, true, 0, 100) ); + settings.addItem(new CMenuOptionNumberChooser(LOCALE_EXTRA_ZAPIT_TIMEOUT, (int *)&zapitCfg.feTimeout, true, 6, 100) ); settings.addItem(new CMenuForwarder(LOCALE_SATSETUP_MANUAL_SCAN, true, NULL, manualScan, "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); settings.addItem(new CMenuForwarder(LOCALE_SATSETUP_AUTO_SCAN, true, NULL, autoScan, "", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 845d59751..c285a3fb5 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -1015,4 +1015,5 @@ printf("CAllUsalsNotifier::changeNotify: %s\n", onoff ? "ON" : "OFF"); for (sit = satellitePositions.begin(); sit != satellitePositions.end(); sit++) { sit->second.use_usals = onoff; } + return true; }