From f194783ebda218ac749c7e374ab52906053a23f9 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 10 Jun 2013 15:07:19 +0400 Subject: [PATCH] gui/scan_setup.cpp: add flag to ignore manual scan params update, while scan menu active Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/9412f3a041c0df9ea88d68a3867f9ae20c1e51c6 Author: [CST] Focus Date: 2013-06-10 (Mon, 10 Jun 2013) --- src/gui/scan_setup.cpp | 6 ++++++ src/gui/scan_setup.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 8b7f38386..ae99800ed 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -217,6 +217,7 @@ CScanSetup::CScanSetup(bool wizard_mode) nid = NULL; lcnhd = NULL; linkfe = NULL; + in_menu = false; } CScanSetup* CScanSetup::getInstance() @@ -327,7 +328,9 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey) printf("[neutrino] CScanSetup %s: init scan setup (Mode: %d)...\n",__FUNCTION__ , is_wizard); CZapit::getInstance()->GetConfig(zapitCfg); + in_menu = true; res = showScanMenu(); + in_menu = false; return res; } @@ -1510,6 +1513,9 @@ printf("[neutrino] CScanSetup::%s: logical numbers %d\n", __FUNCTION__, scansett void CScanSetup::updateManualSettings() { + if (in_menu) + return; + CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel(); if(channel) { transponder_list_t::iterator tI; diff --git a/src/gui/scan_setup.h b/src/gui/scan_setup.h index 5757663d2..3b5515834 100644 --- a/src/gui/scan_setup.h +++ b/src/gui/scan_setup.h @@ -83,6 +83,8 @@ class CScanSetup : public CMenuTarget, public CChangeObserver bool allow_start; /* flag to re-init frontends */ bool fe_restart; + /* flag to skip manual params update while in menu */ + bool in_menu; bool is_wizard;