Skip to content

Commit

Permalink
2018-05-08 Fred Gleason <[email protected]>
Browse files Browse the repository at this point in the history
	* 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.
  • Loading branch information
Fred Gleason committed May 8, 2018
1 parent 3ff1fb5 commit 84147df
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -16647,3 +16647,9 @@
2018-05-05 Fred Gleason <[email protected]>
* Updated 'NEWS'.
* Incremented the package version to 2.19.2int00.
2018-05-08 Fred Gleason <[email protected]>
* 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.
14 changes: 12 additions & 2 deletions lib/rdevent_line.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
//
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 84147df

Please sign in to comment.