diff --git a/ChangeLog b/ChangeLog index c0d03f8a..93b06065 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20821,3 +20821,6 @@ 2021-01-17 Fred Gleason * Restored enforcement of service authorized groups in rdairplay(1) and rdlogedit(1). +2021-01-18 Fred Gleason + * Fixed a regression in rdlibrary(1) that caused macro carts to + get an evergreen background color. diff --git a/lib/rdlibrarymodel.cpp b/lib/rdlibrarymodel.cpp index 876d9a1a..1a360b58 100644 --- a/lib/rdlibrarymodel.cpp +++ b/lib/rdlibrarymodel.cpp @@ -603,37 +603,41 @@ void RDLibraryModel::updateRow(int row,RDSqlQuery *q) d_texts[row][20]=q->value(21); // Owned By d_notes[row]=q->value(30).toString(); - switch((RDCart::Validity)q->value(22).toUInt()) { - case RDCart::NeverValid: - d_background_colors[row]=QColor(RD_CART_ERROR_COLOR); - break; + if(q->value(15).toUInt()==RDCart::Audio) { + switch((RDCart::Validity)q->value(22).toUInt()) { + case RDCart::NeverValid: + d_background_colors[row]=QColor(RD_CART_ERROR_COLOR); + break; - case RDCart::ConditionallyValid: - if(q->value(14).toDateTime().isValid()&& - (q->value(14).toDateTime()value(14).toDateTime().isValid()&& + (q->value(14).toDateTime()value(15).toUInt()==RDCart::Macro) { d_background_colors[row]= QColor(palette().color(QPalette::Active,QColorGroup::Base)); - break; - - case RDCart::EvergreenValid: - d_background_colors[row]=QColor(RD_CART_EVERGREEN_COLOR); - break; } - // printf("start at: %d\n",q->at()); - // // Cut Attributes //