Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-26 06:30:19 +02:00
Code Issues Projects Releases Wiki Activity

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2019-05-31 12:20:52 -04:00
commit b56cd3abfb
2 changed files with 5 additions and 3 deletions

2
ChangeLog

@ -18699,3 +18699,5 @@
2019-05-27 Patrick Linstruth <patrick@deltecent.com>
* Fixed regression in rdlibrary(1) where matching count and
background color codes were inaccurate.
2019-05-31 Patrick Linstruth <patrick@deltecent.com>
* Fixed bug in rdlogmanager(1) deconflicting rules.

6
lib/rdevent_line.cpp

@ -699,8 +699,8 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
*report+=QObject::tr(" with sched code(s): ")+HaveCode()+" "+HaveCode2();
}
*report+="\n";
schedCL->restore();
}
schedCL->restore();
}
//
@ -731,8 +731,8 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
*report+=QObject::tr(" with sched code(s): ")+HaveCode()+" "+HaveCode2();
}
*report+="\n";
schedCL->restore();
}
schedCL->restore();
}
// Clock Scheduler Rules
@ -779,8 +779,8 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
*report+=time.toString("hh:mm:ss")+" "+
QObject::tr("Rule broken: Max. in a Row/Min. Wait for ")+
q->value(0).toString()+"\n";
schedCL->restore();
}
schedCL->restore();
// do not play after
if(q->value(3).toString()!="") {