Merge branch 'ni/cst-next' into ni/mp/cst-next

Origin commit data
------------------
Branch: ni/coolstream
Commit: b82573e85a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-26 15:01:13 +02:00
2 changed files with 14 additions and 3 deletions

View File

@@ -2825,7 +2825,8 @@ void CControlAPI::doNewTimer(CyhookHandler *hh)
eventinfo.epgID = 0;
eventinfo.epg_starttime = 0;
eventinfo.apids = TIMERD_APIDS_CONF;
eventinfo.recordingSafety = (hh->ParamList["rs"] == "1");
eventinfo.recordingSafety = (hh->ParamList["rs"] == "1") || (hh->ParamList["rs"] == "on");
eventinfo.autoAdjustToEPG = (hh->ParamList["aj"] == "1") || (hh->ParamList["aj"] == "on");
// channel by Id or name
if(!hh->ParamList["channel_id"].empty())