diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index aac0b23b4..67d10702c 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -795,7 +795,7 @@ bool CTimerList::RemoteBoxChanExists(t_channel_id channel_id) bool CTimerList::LocalBoxChanExists(t_channel_id channel_id) { - CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); + CZapitChannel * channel = CServiceManager::getInstance()->FindChannel48(channel_id); if (channel) return true; else @@ -884,6 +884,9 @@ void CTimerList::RemoteBoxTimerList(CTimerd::TimerList &rtimerlist) rtimer.epg_starttime = (time_t) atoll(remotetimers[i]["start"][0].get("digits","").asString().c_str()); sscanf(remotetimers[i].get("epg_id","").asString().c_str(), SCANF_CHANNEL_ID_TYPE, &rtimer.epg_id); sscanf(remotetimers[i].get("channel_id","").asString().c_str(), SCANF_CHANNEL_ID_TYPE, &rtimer.channel_id); + CZapitChannel * channel = CServiceManager::getInstance()->FindChannel48(rtimer.channel_id); + if(channel) + rtimer.channel_id = channel->getChannelID(); strncpy(rtimer.epgTitle,remotetimers[i].get("title","").asString().c_str(),sizeof(rtimer.epgTitle)); rtimer.epgTitle[sizeof(rtimer.epgTitle) - 1] = 0; if (remotetimers[i]["audio"].get("apids_conf","").asString() == "true") diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 172f241eb..dfe77a638 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -1510,7 +1510,7 @@ void CControlAPI::GetChannelCGI(CyhookHandler *hh) if (channel_id != 0) { NeutrinoAPI->GetChannelEvents(); - CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); + CZapitChannel * channel = CServiceManager::getInstance()->FindChannel48(channel_id); if (channel) { result = _GetBouquetWriteItem(hh, channel, -1, -1); @@ -3009,6 +3009,10 @@ void CControlAPI::doNewTimer(CyhookHandler *hh) else eventinfo.channel_id = NeutrinoAPI->ChannelNameToChannelId(hh->ParamList["channel_name"]); + CZapitChannel * channel = CServiceManager::getInstance()->FindChannel48(eventinfo.channel_id); + if(channel) + eventinfo.channel_id = channel->getChannelID(); + std::string _rec_dir = hh->ParamList["rec_dir"]; void *data=NULL; if(type == CTimerd::TIMER_RECORD)