diff --git a/ChangeLog b/ChangeLog index e532e85a..b8c8af3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15819,3 +15819,7 @@ 2017-06-02 Fred Gleason * Updated 'NEWS'. * Incremented the package version to 2.16.0. +2017-07-28 Fred Gleason + * Fixed a bug in 'lib/rdevent_line.cpp' that caused embedded traffic + import events to be assigned incorrect link parameters when scheduled + immediately after a voice track. diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp index eb73a12e..a28cbb0e 100644 --- a/lib/rdevent_line.cpp +++ b/lib/rdevent_line.cpp @@ -1040,8 +1040,14 @@ bool RDEventLine::linkLog(RDLogEvent *e,int next_id,const QString &svcname, logline->setTransType(trans_type); logline->setEventLength(event_length); logline->setLinkEventName(event_nested_event); - logline->setLinkStartTime(link_logline->linkStartTime()); - logline->setLinkLength(link_logline->linkLength()); + if((!q->value(12).isNull())&&(!q->value(13).isNull())) { + logline->setLinkStartTime(q->value(12).toTime()); + logline->setLinkLength(q->value(13).toInt()); + } + else { + logline->setLinkStartTime(link_logline->linkStartTime()); + logline->setLinkLength(link_logline->linkLength()); + } logline->setLinkStartSlop(link_logline->linkStartSlop()); logline->setLinkEndSlop(link_logline->linkEndSlop()); logline->setLinkId(link_logline->linkId());