Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-16 08:52:55 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deltecent-issue557'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19766,3 +19766,6 @@
2020-04-08 Patrick Linstruth <patrick@deltecent.com> 2020-04-08 Patrick Linstruth <patrick@deltecent.com>
* Modified rdairplay(1) to always scroll log to the top when using * Modified rdairplay(1) to always scroll log to the top when using
the hour selector. 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.

2
rdlogmanager/generate_log.cpp
View File

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