Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-26 14:32:04 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -18699,3 +18699,5 @@
2019-05-27 Patrick Linstruth <patrick@deltecent.com> 2019-05-27 Patrick Linstruth <patrick@deltecent.com>
* Fixed regression in rdlibrary(1) where matching count and * Fixed regression in rdlibrary(1) where matching count and
background color codes were inaccurate. 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
View File

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