mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 07:51:11 +02:00
gui/scan_setup.cpp: add flag to ignore manual scan params update, while scan menu active
Origin commit data
------------------
Commit: 9412f3a041
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-10 (Mon, 10 Jun 2013)
This commit is contained in:
@@ -217,6 +217,7 @@ CScanSetup::CScanSetup(bool wizard_mode)
|
|||||||
nid = NULL;
|
nid = NULL;
|
||||||
lcnhd = NULL;
|
lcnhd = NULL;
|
||||||
linkfe = NULL;
|
linkfe = NULL;
|
||||||
|
in_menu = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
CScanSetup* CScanSetup::getInstance()
|
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);
|
printf("[neutrino] CScanSetup %s: init scan setup (Mode: %d)...\n",__FUNCTION__ , is_wizard);
|
||||||
CZapit::getInstance()->GetConfig(zapitCfg);
|
CZapit::getInstance()->GetConfig(zapitCfg);
|
||||||
|
in_menu = true;
|
||||||
res = showScanMenu();
|
res = showScanMenu();
|
||||||
|
in_menu = false;
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@@ -1510,6 +1513,9 @@ printf("[neutrino] CScanSetup::%s: logical numbers %d\n", __FUNCTION__, scansett
|
|||||||
|
|
||||||
void CScanSetup::updateManualSettings()
|
void CScanSetup::updateManualSettings()
|
||||||
{
|
{
|
||||||
|
if (in_menu)
|
||||||
|
return;
|
||||||
|
|
||||||
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
|
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
|
||||||
if(channel) {
|
if(channel) {
|
||||||
transponder_list_t::iterator tI;
|
transponder_list_t::iterator tI;
|
||||||
|
@@ -83,6 +83,8 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
|
|||||||
bool allow_start;
|
bool allow_start;
|
||||||
/* flag to re-init frontends */
|
/* flag to re-init frontends */
|
||||||
bool fe_restart;
|
bool fe_restart;
|
||||||
|
/* flag to skip manual params update while in menu */
|
||||||
|
bool in_menu;
|
||||||
|
|
||||||
bool is_wizard;
|
bool is_wizard;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user