diff --git a/ChangeLog b/ChangeLog index cf0a9558..b66c8963 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18699,3 +18699,5 @@ 2019-05-27 Patrick Linstruth * Fixed regression in rdlibrary(1) where matching count and background color codes were inaccurate. +2019-05-31 Patrick Linstruth + * Fixed bug in rdlogmanager(1) deconflicting rules. diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp index de0f804a..d3650b7c 100644 --- a/lib/rdevent_line.cpp +++ b/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()!="") {