neutrino.cpp: try to fix timeshift stop/restart,

after quit from playback audioplayer, picture viewer and so on
This commit is contained in:
[CST] Focus
2015-01-21 18:00:25 +03:00
parent c6424534e8
commit ecff984432
4 changed files with 24 additions and 13 deletions

View File

@@ -674,9 +674,6 @@ const std::string & CRemoteControl::subChannelDown(void)
void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::string & channame, int channum, const bool start_video) // UTF-8
{
current_channel_id = channel_id;
current_channel_name = channame;
current_channel_num = channum;
//printf("zapTo_ChannelID: start_video: %d\n", start_video);
if (start_video)
startvideo();
@@ -702,7 +699,9 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
{
g_InfoViewer->chanready = 0;
CRecordManager::getInstance()->StopAutoRecord();
CRecordManager::getInstance()->StopAutoTimer();
if (channel_id != current_channel_id)
CRecordManager::getInstance()->StopAutoRecord();
g_RCInput->killTimer(scrambled_timer);
//dvbsub_pause(true);
@@ -713,9 +712,12 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
g_Zapit->zapTo_serviceID_NOWAIT(channel_id);
zap_completion_timeout = now + ZAP_GUARD_TIME;
//g_Sectionsd->setServiceChanged( current_channel_id, false );
//g_Sectionsd->setServiceChanged( channel_id, false );
//g_RCInput->killTimer( current_programm_timer );
}
current_channel_id = channel_id;
current_channel_name = channame;
current_channel_num = channum;
}
void CRemoteControl::startvideo()