From 2c05d780e1201d5e71744b0939b79ca74d92cba3 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 31 Oct 2012 12:37:20 +0100 Subject: [PATCH] src/neutrino.cpp:zapto timer add transponder test Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8ab45c8baa87cb96c89bdacd871ff948a6313aab Author: Jacek Jendrzej Date: 2012-10-31 (Wed, 31 Oct 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 98d55690a..e3bb1e3ad 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2631,8 +2631,8 @@ _repeat: else if( msg == NeutrinoMessages::ZAPTO) { CTimerd::EventInfo * eventinfo = (CTimerd::EventInfo *) data; if (eventinfo->channel_id != CZapit::getInstance()->GetCurrentChannelID()){ - /* FIXME zapto if recordingstatus == 1 && haveFreeFrontend == 0 on same transponder and check for twin box in loop and independet mode */ - if( (recordingstatus == 0) || (recordingstatus && CRecordManager::getInstance()->TimeshiftOnly()) || (recordingstatus && CFEManager::getInstance()->haveFreeFrontend()) ) { + if( (recordingstatus == 0) || (recordingstatus && CRecordManager::getInstance()->TimeshiftOnly()) || (recordingstatus && CFEManager::getInstance()->haveFreeFrontend()) || + (recordingstatus && channelList->SameTP(eventinfo->channel_id)) ) { bool isTVMode = CServiceManager::getInstance()->IsChannelTVChannel(eventinfo->channel_id); dvbsub_stop();