src/neutrino.cpp:-fix multirecording if announce_record on zap on is

This commit is contained in:
satbaby
2012-10-31 13:13:02 +01:00
parent 8ab45c8baa
commit ea1caedb51

View File

@@ -2681,9 +2681,10 @@ _repeat:
} }
if( g_settings.recording_zap_on_announce && (mode != mode_standby) && (eventinfo->channel_id != CZapit::getInstance()->GetCurrentChannelID())) { if( g_settings.recording_zap_on_announce && (mode != mode_standby) && (eventinfo->channel_id != CZapit::getInstance()->GetCurrentChannelID())) {
//TODO check transponder ?
CRecordManager::getInstance()->StopAutoRecord(); CRecordManager::getInstance()->StopAutoRecord();
if(!CRecordManager::getInstance()->RecordingStatus()) { bool recordingStatus = CRecordManager::getInstance()->RecordingStatus();
if ( !recordingStatus || (recordingStatus && CRecordManager::getInstance()->TimeshiftOnly()) || (recordingStatus && CFEManager::getInstance()->haveFreeFrontend()) ||
(recordingStatus && channelList->SameTP(eventinfo->channel_id)) ){
dvbsub_stop(); dvbsub_stop();
t_channel_id channel_id=eventinfo->channel_id; t_channel_id channel_id=eventinfo->channel_id;
g_Zapit->zapTo_serviceID_NOWAIT(channel_id); g_Zapit->zapTo_serviceID_NOWAIT(channel_id);