Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-24 09:28:54 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deltecent-orafter'

Browse Source
This commit is contained in:
Fred Gleason 2019-05-09 16:16:10 -04:00
commit 7dc6aaf464
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18649,3 +18649,6 @@
* Modified apis/rivwebcapi/rivwebcapi/rd_editcart.h and
apis/rivwebcapi/rivwebcapi/rd_editcut.h to match the
respective rd_cart.h, rd_cuts.h files in the api.
2019-05-09 Patrick Linstruth <patrick@deltecent.com>
* Fixed bug in clock schedule rules where "or After" schedule codes
were not displayed correctly.

2
lib/rdschedruleslist.cpp
View File

@ -64,7 +64,7 @@ RDSchedRulesList::RDSchedRulesList(QString clockname,RDConfig *config)
min_wait[i] = q1->value(1).toInt();
not_after[i] = q1->value(2).toString();
or_after[i] = q1->value(3).toString();
or_after_II[i] = q1->value(3).toString();
or_after_II[i] = q1->value(4).toString();
}
else {
max_row[i] = 1;

2
rdlogmanager/edit_schedcoderules.cpp
View File

@ -146,7 +146,7 @@ editSchedCodeRules::editSchedCodeRules(Q3ListViewItem *item,
}
comboBox_not_after->setCurrentText(item->text(3));
comboBox_or_after->setCurrentText(item->text(4));
comboBox_or_after->setCurrentText(item->text(5));
comboBox_or_after_II->setCurrentText(item->text(5));
label_description = new QLabel(this);
label_description->setGeometry( QRect( 200, 40, 300, 40 ) );