Merged v2.19

ChangeLog

@@ -16779,6 +16779,8 @@
 2018-04-14 Fred Gleason <fredg@paravelsystems.com>
 	* Cleaned up spurious HPI error messages being sent to the syslog.
 2018-04-14 Fred Gleason <fredg@paravelsystems.com>
+	* Updated 'NEWS'.
+	* Incremented the package version to 2.19.2.
 	* Moved the 'LogPlay' class in rdairplay(1) to 'RDLogPlay' in
 	the core library.
 	* Moved the 'RLMHost' class in rdairplay(1) to 'RDRLMHost' in
@@ -16791,6 +16793,11 @@
 	'SERVICES.LOG_SHELFLIFE_ORIGIN', 'SERVICES.TFC_IMPORT_TEMPLATE' and
 	'SERVICE.MUS_IMPORT_TEMPLATE field values to fail to be cloned from
 	the exemplar when creating a new Service.
+2018-05-05 Fred Gleason <fredg@paravelsystems.com>
+	* 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).
 2018-05-07 Fred Gleason <fredg@paravelsystems.com>
 	* Added a 'USERS.WEBGET_LOGIN_PRIV' field to the database.
 	* Incremented the database version to 277.

NEWS

@@ -1,5 +1,21 @@
 The NEWS file for the Rivendell package.
 
+-------------------------------------------------------------------------------
+v2.19.2int00 -- 5/5/2018
+
+Changes:
+   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).
+
+Database Update:
+   This version of Rivendell uses database schema version 275, and will
+   automatically upgrade any earlier versions.  To see the current schema
+   version prior to upgrade, see RDAdmin->SystemInfo.
+
+   As always, be sure to run RDAdmin immediately after upgrading to allow 
+   any necessary changes to the database schema to be applied.
 -------------------------------------------------------------------------------
 v2.19.2 -- 4/14/2018
 

PACKAGE_VERSION

@@ -1 +1 @@
-2.19.2
+2.19.2int00

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()) {