diff --git a/ChangeLog b/ChangeLog index 0e39c7b9..d976c8cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20794,3 +20794,7 @@ 2021-08-31 Fred Gleason * Deprecated use of the 'Transmit Now & Next data' checkbox in the 'Group' dialog in rdadmin(1). +2021-09-07 Fred Gleason + * Fixed a bug in rdlogmanager(1) that caused leading event + attributes to fail to be preserved when suppressing Music of + Traffic import markers. diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp index 269579c2..d5e6e080 100644 --- a/lib/rdevent_line.cpp +++ b/lib/rdevent_line.cpp @@ -1033,7 +1033,6 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname, logline->setStartTime(RDLogLine::Logged,time); logline->setType(RDLogLine::TrafficLink); logline->setSource(event_src); - logline->setTransType(trans_type); logline->setEventLength(event_length); logline->setLinkEventName(event_nested_event); logline->setLinkStartTime(q->value(9).toTime()); @@ -1055,7 +1054,6 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname, logline->setStartTime(RDLogLine::Logged,time); logline->setType(RDLogLine::Track); logline->setSource(event_src); - logline->setTransType(RDLogLine::Segue); logline->setMarkerComment(q->value(7).toString()); logline->setEventLength(event_length); logline->setLinkEventName(event_name); @@ -1077,7 +1075,6 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname, logline->setStartTime(RDLogLine::Logged,time); logline->setType(RDLogLine::Marker); logline->setSource(event_src); - logline->setTransType(RDLogLine::Segue); logline->setMarkerComment(q->value(7).toString()); logline->setEventLength(event_length); logline->setLinkEventName(event_name); @@ -1102,9 +1099,6 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname, QTime(start_start_hour,0,0).addSecs(q->value(1).toInt())); logline->setType(RDLogLine::Cart); logline->setCartNumber(q->value(0).toUInt()); - logline->setGraceTime(grace_time); - logline->setTimeType(time_type); - logline->setTransType(trans_type); logline->setExtStartTime(QTime().addSecs(3600*start_start_hour+ q->value(1).toInt())); logline->setExtLength(q->value(2).toInt()); @@ -1123,6 +1117,13 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname, time=time.addMSecs(length); } + // + // Apply Leading Event Values + // + logline->setGraceTime(grace_time); + logline->setTimeType(time_type); + logline->setTransType(trans_type); + // // Clear Leading Event Values //