diff --git a/ChangeLog b/ChangeLog index 850b2cb5..8793bfba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15053,3 +15053,7 @@ 2016-03-30 Fred Gleason * Added a switcher driver for the Broadcast Tools SS 4.1 MLR Switcher/Router in 'ripcd/btss41mlr.cpp' and 'ripcd/btss41mlr.h'. +2016-03-30 Fred Gleason + * Fixed a regression in 'rdlibrary/audio_cart.cpp' that caused + cuts to be shown as invalid when 'Schedule Cuts by weight' was + selected. diff --git a/rdlibrary/audio_cart.cpp b/rdlibrary/audio_cart.cpp index 50e403f0..69de3d7b 100644 --- a/rdlibrary/audio_cart.cpp +++ b/rdlibrary/audio_cart.cpp @@ -732,12 +732,13 @@ void AudioCart::RefreshList() // l->setText(0,q->value(0).toString()); l->setText(1,q->value(2).toString()); l->setText(2,RDGetTimeLength(q->value(3).toUInt())); - if (q->value(0) == 0){// zero weight + if(rdcart_use_weighting&&(q->value(1).toInt()==0)){// zero weight l->setBackgroundColor(RD_CART_ERROR_COLOR); if(pass==0) { err=true; } - } else { + } + else { switch(ValidateCut(q,10,RDCart::NeverValid,current_datetime)) { case RDCart::NeverValid: l->setBackgroundColor(RD_CART_ERROR_COLOR); @@ -843,9 +844,10 @@ void AudioCart::RefreshLine(RDListViewItem *item) item->setText(0,q->value(rdcart_use_weighting).toString()); item->setText(1,q->value(2).toString()); item->setText(2,RDGetTimeLength(q->value(3).toUInt())); - if (q->value(0) == 0){ //zero weight - item->setBackgroundColor(RD_CART_ERROR_COLOR); - } else { + if(rdcart_use_weighting&&(q->value(1).toInt()==0)){ //zero weight + item->setBackgroundColor(RD_CART_ERROR_COLOR); + } + else { switch(ValidateCut(q,10,RDCart::NeverValid,current_datetime)) { case RDCart::NeverValid: item->setBackgroundColor(RD_CART_ERROR_COLOR);