From 5c65f09e605cca3cdb23be849ca859133290ebd1 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sat, 5 May 2018 20:11:32 +0000 Subject: [PATCH] 2018-05-04 Fred Gleason * Fixed a bug that caused the 'Switcher Matrix' and 'Switcher Output' dropdowns to populate incorrect values when selecting a non-local 'Switcher Host' in the 'Configure RDCatch' dialog in rdadmin(1). --- ChangeLog | 5 +++++ rdadmin/edit_decks.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2948cf10..49a4bb44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16639,3 +16639,8 @@ 2018-04-14 Fred Gleason * Updated 'NEWS'. * Incremented the package version to 2.19.2. +2018-05-04 Fred Gleason + * Fixed a bug that caused the 'Switcher Matrix' and + 'Switcher Output' dropdowns to populate incorrect values when + selecting a non-local 'Switcher Host' in the 'Configure RDCatch' + dialog in rdadmin(1). diff --git a/rdadmin/edit_decks.cpp b/rdadmin/edit_decks.cpp index babb422b..ad91890a 100644 --- a/rdadmin/edit_decks.cpp +++ b/rdadmin/edit_decks.cpp @@ -806,7 +806,7 @@ QStringList EditDecks::GetActiveOutputMatrices() edit_matrix_ids.clear(); sql=QString("select TYPE,NAME,OUTPUTS,MATRIX from MATRICES where ")+ - "STATION_NAME=\""+RDEscapeString(edit_station->name())+"\""; + "STATION_NAME=\""+RDEscapeString(edit_swstation_box->currentText())+"\""; q=new RDSqlQuery(sql); while(q->next()) { switch((RDMatrix::Type)q->value(0).toInt()) {