diff --git a/ChangeLog b/ChangeLog index f0b7b615..609de436 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14420,3 +14420,6 @@ 2014-09-04 Fred Gleason * Removed object names in 'rdairplay/log_play.cpp' and 'rdairplay/log_play.h'. +2014-09-04 Fred Gleason + * Fixed a bug in 'rdairplay/nownext.cpp' that caused PAD updates + to be sent for macro carts with the asyncronous attribute set. diff --git a/rdairplay/nownext.cpp b/rdairplay/nownext.cpp index f17c7c63..efa7e13d 100644 --- a/rdairplay/nownext.cpp +++ b/rdairplay/nownext.cpp @@ -74,7 +74,7 @@ void LogPlay::SendNowNext() for(int i=nextLine();istatus()==RDLogLine::Scheduled)&& - logLine(i)->nowNextEnabled()) { + logLine(i)->nowNextEnabled()&&(!logLine(i)->asyncronous())) { logline[1]=logLine(i); i=size(); } @@ -91,7 +91,9 @@ void LogPlay::SendNowNext() unsigned nowcart=0; unsigned nextcart=0; if(logline[0]!=NULL) { - nowcart=logline[0]->cartNumber(); + if(!logline[0]->asyncronous()) { + nowcart=logline[0]->cartNumber(); + } } if(logline[1]!=NULL) { nextcart=logline[1]->cartNumber();