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

2014-09-13 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in 'rdadmin/edit_decks.cpp' that caused the incorrect
	switcher matrix value to be loaded when selecting a new switcher
	host.
	* Fixed a bug in 'rdadmin/edit_decks.cpp' that caused spurious
	entries to appear in the list of available matrix output sources.
This commit is contained in:
Fred Gleason 2014-09-13 12:55:07 -04:00
parent c6b6df80a6
commit 0e458f7c29
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -14450,6 +14450,12 @@
2014-09-11 Fred Gleason <fredg@paravelsystems.com> 2014-09-11 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in 'liob/rdreport.cpp' that broke report * Fixed a regression in 'liob/rdreport.cpp' that broke report
generation. generation.
2014-09-11 Fred Gleason <fredg@paravelsystems.com> 2014-09-12 Fred Gleason <fredg@paravelsystems.com>
* Updated 'NEWS'. * Updated 'NEWS'.
* Incremented the package version to 2.9.2. * Incremented the package version to 2.9.2.
2014-09-13 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'rdadmin/edit_decks.cpp' that caused the incorrect
switcher matrix value to be loaded when selecting a new switcher
host.
* Fixed a bug in 'rdadmin/edit_decks.cpp' that caused spurious
entries to appear in the list of available matrix output sources.

15
rdadmin/edit_decks.cpp
View File

@ -428,7 +428,11 @@ void EditDecks::stationActivatedData(const QString &str)
edit_swmatrix_box->clear(); edit_swmatrix_box->clear();
edit_swmatrix_box->insertStringList(GetActiveOutputMatrices()); edit_swmatrix_box->insertStringList(GetActiveOutputMatrices());
for(unsigned i=0;i<edit_matrix_ids.size();i++) {
if(edit_matrix_ids[i]==edit_record_deck->switchMatrix()) {
edit_swmatrix_box->setCurrentItem(i);
}
}
matrixActivatedData(edit_swmatrix_box->currentText()); matrixActivatedData(edit_swmatrix_box->currentText());
} }
@ -457,10 +461,11 @@ void EditDecks::matrixActivatedData(const QString &str)
return; return;
} }
int matrix=edit_matrix_ids[edit_swmatrix_box->currentItem()]; int matrix=edit_matrix_ids[edit_swmatrix_box->currentItem()];
sql=QString().sprintf("select NAME from OUTPUTS where \ sql=QString("select NAME from OUTPUTS where ")+
STATION_NAME=\"%s\"&&MATRIX=%d", "(STATION_NAME=\""+RDEscapeString(edit_swstation_box->currentText())+
(const char *)edit_swstation_box->currentText(), "\")&&"+
matrix); QString().sprintf("(MATRIX=%d)&&",matrix)+
"(NAME!=\"\")";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
edit_swoutput_box->insertItem(q->value(0).toString()); edit_swoutput_box->insertItem(q->value(0).toString());