From 7b772ca1014077620e380572e072c3506c05ec7d Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Thu, 5 Sep 2019 14:42:45 -0400 Subject: [PATCH] 2019-09-05 Fred Gleason * Fixed a regression in rdairplay(1) and rdvairplayd(8) that caused hard timed events with the 'Start Immediately' attribute to fail to start if one or more other events were playing. --- ChangeLog | 4 ++++ lib/rdlogplay.cpp | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0b30afd..98a2aba3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19089,3 +19089,7 @@ 2019-09-03 Fred Gleason * Fixed a bug in 'RDCart::setYear()' that caused invalid SQL to be generated when given a null year. +2019-09-05 Fred Gleason + * Fixed a regression in rdairplay(1) and rdvairplayd(8) that + caused hard timed events with the 'Start Immediately' attribute + to fail to start if one or more other events were playing. diff --git a/lib/rdlogplay.cpp b/lib/rdlogplay.cpp index ef0f8f3f..3010a270 100644 --- a/lib/rdlogplay.cpp +++ b/lib/rdlogplay.cpp @@ -1431,11 +1431,9 @@ void RDLogPlay::transTimerData() if((logline=logLine(play_trans_line))!=NULL) { grace=logline->graceTime(); } - if(running_events==0) { - makeNext(play_trans_line); - if(logline->transType()!=RDLogLine::Stop || grace>=0) { - StartEvent(trans_line,RDLogLine::Play,0,RDLogLine::StartTime); - } + makeNext(play_trans_line); + if(logline->transType()!=RDLogLine::Stop || grace>=0) { + StartEvent(trans_line,RDLogLine::Play,0,RDLogLine::StartTime); } } SetTransTimer();