diff --git a/ChangeLog b/ChangeLog index f94df90f..4e3e3098 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19749,3 +19749,8 @@ * Fixed a regression in rdairplay(1) that caused two events to be started by a single spacebar tap if a SoundPanel event had been played previously. +2020-04-08 Fred Gleason + * Fixed a bug in rdlogmanager(1) that caused the initial event + in an imported set to fail receive the proper time and transition + type if the 'Include Import Markers in Finished Logs' checkbox in + rdadmin(1) had not been ticked. diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp index 05eb8d54..63948b5b 100644 --- a/lib/rdevent_line.cpp +++ b/lib/rdevent_line.cpp @@ -2,7 +2,7 @@ // // Abstract a Rivendell Log Manager Event // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2020 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -996,15 +996,22 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname, *(e->logLine(e->size()-1))=*logline; delete logline; logline=NULL; - } - // - // Clear Leading Event Values - // - time_type=RDLogLine::Relative; - trans_type=event_default_transtype; - // time=time.addMSecs(length); - grace_time=-1; + // + // Clear Leading Event Values + // + time_type=RDLogLine::Relative; + trans_type=event_default_transtype; + grace_time=-1; + } + else { + // + // Propagate Leading Event Values to Next Event + // + time_type=link_logline->timeType(); + trans_type=link_logline->transType(); + grace_time=link_logline->graceTime(); + } // // Calculate Event Time Boundaries @@ -1190,6 +1197,13 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname, } } time=time.addMSecs(length); + + // + // Clear Leading Event Values + // + time_type=RDLogLine::Relative; + trans_type=event_default_transtype; + grace_time=-1; } delete q;