diff --git a/ChangeLog b/ChangeLog index 023616768..ef3809680 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16647,3 +16647,9 @@ 2018-05-05 Fred Gleason * Updated 'NEWS'. * Incremented the package version to 2.19.2int00. +2018-05-08 Fred Gleason + * Fixed a bug in rdlogmanager(1) that caused the initial transition + type specified in the 'IMPORT' section of the 'Editing Event' dialog + to be applied to both the parent log link and the first imported + event when the 'PRE-IMPORT CARTS' list was empty and no Timed Start + was enabled. diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp index fff092644..790e686d4 100644 --- a/lib/rdevent_line.cpp +++ b/lib/rdevent_line.cpp @@ -928,6 +928,14 @@ bool RDEventLine::linkLog(RDLogEvent *e,const QString &svcname, delete logline; logline=NULL; + // + // Clear Leading Event Values + // + time_type=RDLogLine::Relative; + trans_type=event_default_transtype; + // time=time.addMSecs(length); + grace_time=-1; + // // Calculate Event Time Boundaries // @@ -1104,15 +1112,17 @@ bool RDEventLine::linkLog(RDLogEvent *e,const QString &svcname, logline->setCartNumber(q->value(0).toUInt()); } } - + /* // // Clear Leading Event Values // time_type=RDLogLine::Relative; trans_type=event_default_transtype; + */ time=time.addMSecs(length); + /* grace_time=-1; - + */ } delete q;