diff --git a/ChangeLog b/ChangeLog index c80529ce..6842a8ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16805,3 +16805,9 @@ methods. * Added a 'Allow WebGet Login' control in the 'Production Rights' section of the 'User' dialog in rdadmin(1). +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/NEWS b/NEWS index 8133dc4a..773fa5f8 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ The NEWS file for the Rivendell package. ------------------------------------------------------------------------------- -v2.19.2int00 -- 5/5/2018 +v2.19.2int01 -- 5/8/2018 Changes: Fixed a bug that caused the 'Switcher Matrix' and @@ -9,6 +9,12 @@ Changes: selecting a non-local 'Switcher Host' in the 'Configure RDCatch' dialog in rdadmin(1). + 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. + Database Update: This version of Rivendell uses database schema version 275, and will automatically upgrade any earlier versions. To see the current schema diff --git a/PACKAGE_VERSION b/PACKAGE_VERSION index 5c123c25..c0d44a11 100644 --- a/PACKAGE_VERSION +++ b/PACKAGE_VERSION @@ -1 +1 @@ -2.19.2int00 \ No newline at end of file +2.19.2int01 \ No newline at end of file diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp index fff09264..790e686d 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; diff --git a/rivendell.ism b/rivendell.ism old mode 100755 new mode 100644 index 2e9458e5..ce529750 Binary files a/rivendell.ism and b/rivendell.ism differ