From dcbf96b0372f9164a0b9ee8395e10e33e7288c1b Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Mon, 27 May 2019 18:18:59 -0700 Subject: [PATCH 1/2] Fixed bug in rdlogmanager(1) deconflicting rules. --- lib/rdevent_line.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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()!="") { From a8a400e7330277143d27e6c9a1d6e64735a1d954 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Mon, 27 May 2019 18:20:05 -0700 Subject: [PATCH 2/2] Updated ChangeLog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2e5566e0..056d5707 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18696,3 +18696,5 @@ 2019-05-24 Fred Gleason * Fixed a regression in rdgpimon(1) that caused GPIO status to fail to be displayed in the status widgets. +2019-05-27 Patrick Linstruth + * Fixed bug in rdlogmanager(1) deconflicting rules.