Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-14 07:10:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deltecent-issue423'

Browse Source
This commit is contained in:
Fred Gleason 2019-05-23 14:50:01 -04:00
commit 1039e64cf6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18678,3 +18678,6 @@
'--end-startup-after-rdpadengined', '--end-startup-after-rdvairplayd', '--end-startup-after-rdpadengined', '--end-startup-after-rdvairplayd',
and '--end-startup-after-rdrepld' command line switches to and '--end-startup-after-rdrepld' command line switches to
rdservice(8). rdservice(8).
2019-05-19 Patrick Linstruth <patrick@deltecent.com>
* Fixed bug in 'RDCartDialog' that caused an empty scheduler code
dropdown box.

9
lib/rdcart_dialog.cpp
View File

@ -420,9 +420,6 @@ void RDCartDialog::groupActivatedData(const QString &group)
if(cart_group!=NULL) { if(cart_group!=NULL) {
*cart_group=group; *cart_group=group;
} }
if(cart_group!=NULL) {
*cart_group=group;
}
} }
@ -683,7 +680,7 @@ void RDCartDialog::RefreshCarts()
group=""; group="";
} }
QString schedcode=cart_schedcode_box->currentText(); QString schedcode=cart_schedcode_box->currentText();
if(group==QString(tr("ALL"))) { if(schedcode==QString(tr("ALL"))) {
schedcode=""; schedcode="";
} }
if(cart_type==RDCart::All) { if(cart_type==RDCart::All) {
@ -817,7 +814,7 @@ void RDCartDialog::BuildGroupList()
for(int i=0;i<cart_group_box->count();i++) { for(int i=0;i<cart_group_box->count();i++) {
if(*cart_group==cart_group_box->text(i)) { if(*cart_group==cart_group_box->text(i)) {
cart_group_box->setCurrentItem(i); cart_group_box->setCurrentItem(i);
return; break;
} }
} }
} }
@ -841,7 +838,7 @@ void RDCartDialog::BuildGroupList()
for(int i=0;i<cart_schedcode_box->count();i++) { for(int i=0;i<cart_schedcode_box->count();i++) {
if(*cart_schedcode==cart_schedcode_box->text(i)) { if(*cart_schedcode==cart_schedcode_box->text(i)) {
cart_schedcode_box->setCurrentItem(i); cart_schedcode_box->setCurrentItem(i);
return; break;
} }
} }
} }