Merge branch 'deltecent-issue557'

This commit is contained in:
Fred Gleason 2020-04-08 19:13:09 -04:00
commit 818a541190
2 changed files with 5 additions and 0 deletions

View File

@ -19766,3 +19766,6 @@
2020-04-08 Patrick Linstruth <patrick@deltecent.com>
* Modified rdairplay(1) to always scroll log to the top when using
the hour selector.
2020-04-08 Patrick Linstruth <patrick@deltecent.com>
* Modified rdlogmanager(1) to disable merge buttons if the selected
log does not contain any import links.

View File

@ -599,6 +599,7 @@ void GenerateLog::UpdateControls()
}
else {
gen_music_enabled=false;
gen_music_button->setDisabled(true);
gen_mus_merged_label->setPixmap(*gen_whiteball_map);
}
if(log->linkQuantity(RDLog::SourceTraffic)>0) {
@ -612,6 +613,7 @@ void GenerateLog::UpdateControls()
}
else {
gen_traffic_enabled=false;
gen_traffic_button->setDisabled(true);
gen_tfc_merged_label->setPixmap(*gen_whiteball_map);
}
}