From f7718fad3b2d056ef86ec811d206d8dbe0c0bdc8 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 5 May 2019 11:23:47 +0200 Subject: [PATCH] adzap: add tzap to monitor mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d983672a86dcfa3de368deeba242304b2544e1ba Author: Jacek Jendrzej Date: 2019-05-05 (Sun, 05 May 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/adzap.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/adzap.cpp b/src/gui/adzap.cpp index caad4b061..6f9315160 100644 --- a/src/gui/adzap.cpp +++ b/src/gui/adzap.cpp @@ -261,7 +261,7 @@ int CAdZapMenu::exec(CMenuTarget *parent, const std::string & actionKey) armed = true; alerted = false; Update(); - if (CNeutrinoApp::getInstance()->channelList && g_settings.adzap_zapOnActivation != SNeutrinoSettings::ADZAP_ZAP_OFF) + if (g_settings.adzap_zapOnActivation != SNeutrinoSettings::ADZAP_ZAP_OFF && CNeutrinoApp::getInstance()->channelList) Zap_On_Activation(CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID()); return res; @@ -283,6 +283,8 @@ int CAdZapMenu::exec(CMenuTarget *parent, const std::string & actionKey) monitorLifeTime.tv_sec = getMonitorLifeTime(); printf("CAdZapMenu::%s: monitorLifeTime.tv_sec: %d\n", __func__, (uint) monitorLifeTime.tv_sec); Update(); + if (g_settings.adzap_zapOnActivation != SNeutrinoSettings::ADZAP_ZAP_OFF && CNeutrinoApp::getInstance()->channelList) + Zap_On_Activation(CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID()); return res; } if (actionKey == "adzap")