2016-03-30 Fred Gleason <fredg@paravelsystems.com>

* Fixed a regression in 'rdlibrary/audio_cart.cpp' that caused
	cuts to be shown as invalid when 'Schedule Cuts by weight' was
	selected.
This commit is contained in:
Fred Gleason 2016-03-30 18:22:37 -04:00
parent 582cc97959
commit 882c4b5956
2 changed files with 11 additions and 5 deletions

View File

@ -15053,3 +15053,7 @@
2016-03-30 Fred Gleason <fredg@paravelsystems.com>
* 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 <fredg@paravelsystems.com>
* Fixed a regression in 'rdlibrary/audio_cart.cpp' that caused
cuts to be shown as invalid when 'Schedule Cuts by weight' was
selected.

View File

@ -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);