mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-04-24 17:37:53 +02:00
Merge branch 'deltecent-issue423'
This commit is contained in:
commit
1039e64cf6
@ -18678,3 +18678,6 @@
|
||||
'--end-startup-after-rdpadengined', '--end-startup-after-rdvairplayd',
|
||||
and '--end-startup-after-rdrepld' command line switches to
|
||||
rdservice(8).
|
||||
2019-05-19 Patrick Linstruth <patrick@deltecent.com>
|
||||
* Fixed bug in 'RDCartDialog' that caused an empty scheduler code
|
||||
dropdown box.
|
||||
|
@ -420,9 +420,6 @@ void RDCartDialog::groupActivatedData(const QString &group)
|
||||
if(cart_group!=NULL) {
|
||||
*cart_group=group;
|
||||
}
|
||||
if(cart_group!=NULL) {
|
||||
*cart_group=group;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -683,7 +680,7 @@ void RDCartDialog::RefreshCarts()
|
||||
group="";
|
||||
}
|
||||
QString schedcode=cart_schedcode_box->currentText();
|
||||
if(group==QString(tr("ALL"))) {
|
||||
if(schedcode==QString(tr("ALL"))) {
|
||||
schedcode="";
|
||||
}
|
||||
if(cart_type==RDCart::All) {
|
||||
@ -817,7 +814,7 @@ void RDCartDialog::BuildGroupList()
|
||||
for(int i=0;i<cart_group_box->count();i++) {
|
||||
if(*cart_group==cart_group_box->text(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++) {
|
||||
if(*cart_schedcode==cart_schedcode_box->text(i)) {
|
||||
cart_schedcode_box->setCurrentItem(i);
|
||||
return;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user