diff --git a/ChangeLog b/ChangeLog index 3e4a3d04..36cb588c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19857,3 +19857,7 @@ * Added a 'Results Report' report in rdadmin(1). 2020-06-05 Fred Gleason * Incremented the package version 3.4.0int0. +2020-06-08 Fred Gleason + * Fixed a regression in rdairplay(1) that caused the 'Forced Segue' + setting in rdadmin(1) to be ignored when executing an event with + a hard start attribute. diff --git a/lib/rdlogplay.cpp b/lib/rdlogplay.cpp index 546beae7..8ac71d01 100644 --- a/lib/rdlogplay.cpp +++ b/lib/rdlogplay.cpp @@ -2,7 +2,7 @@ // // Rivendell Log Playout Machine // -// (C) Copyright 2002-2019 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 @@ -1432,7 +1432,13 @@ void RDLogPlay::transTimerData() } makeNext(play_trans_line); if(logline->transType()!=RDLogLine::Stop || grace>=0) { - StartEvent(trans_line,RDLogLine::Play,0,RDLogLine::StartTime); + if(play_trans_length>0) { + StartEvent(trans_line,RDLogLine::Segue,play_trans_length, + RDLogLine::StartTime); + } + else { + StartEvent(trans_line,RDLogLine::Play,0,RDLogLine::StartTime); + } } } SetTransTimer();