Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-09-17 17:00:27 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #222 from deltecent/master

Browse Source 
2018-08-25 Patrick Linstruth <patrick@deltecent.com>
This commit is contained in:
Fred Gleason 2018-08-28 11:58:33 -04:00 committed by GitHub
commit 319928a6cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -17524,3 +17524,9 @@
2018-06-24 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlogmanager(1) that caused a segfault
when generating a log.
2018-08-25 Patrick Linstruth <patrick@deltecent.com>
* Fixed a regression in rdcatchd(1) to change location
of rdcatchd(1) from 'bin/rdcatchd' to 'sbin/rdcatchd'.
2018-08-25 Patrick Linstruth <patrick@deltecent.com>
* Fixed a regression in rdservice(8) by removing quotation marks
from rdimport(1) '--add-scheduler-code' argument that broke dropboxes.

2
rdcatchd/rdcatchd.cpp
View File

@ -2733,7 +2733,7 @@ void MainObject::StartRmlRecording(int chan,int cartnum,int cutnum,int maxlen)
void MainObject::StartBatch(int id)
{
if((fork())==0) {
QString bin=QString(RD_PREFIX)+"/"+"bin/rdcatchd";
QString bin=QString(RD_PREFIX)+"/"+"sbin/rdcatchd";
execl(bin,(const char *)bin,
(const char *)QString().sprintf("--event-id=%d",id),
(char *)NULL);

4
rdservice/startup.cpp
View File

@ -170,8 +170,8 @@ bool MainObject::StartDropboxes(QString *err_msg)
QString().sprintf("DROPBOX_ID=%d",q->value(0).toInt());
q1=new RDSqlQuery(sql);
while(q1->next()) {
args.push_back(QString().sprintf("--add-scheduler-code=\"")+
q1->value(0).toString()+"\"");
args.push_back(QString().sprintf("--add-scheduler-code=")+
q1->value(0).toString()+"");
}
delete q1;
args.push_back(QString().sprintf("--normalization-level=%d",