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

2022-05-23 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdadmin(1) in the 'Edit GPIs' dialog that
	caused changes in macro cart assignments to fail to be saved.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-05-23 14:14:36 -04:00
parent 07db229e99
commit cb8dfb1c38
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -23158,3 +23158,6 @@
2022-05-23 Fred Gleason <fredg@paravelsystems.com> 2022-05-23 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the 'SAS USI' switcher driver in ripcd(8) that * Fixed a bug in the 'SAS USI' switcher driver in ripcd(8) that
could cause a segfault upon receipt of a network error. could cause a segfault upon receipt of a network error.
2022-05-23 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdadmin(1) in the 'Edit GPIs' dialog that
caused changes in macro cart assignments to fail to be saved.

6
rdadmin/edit_gpi.cpp
View File

@ -2,7 +2,7 @@
// //
// Edit a Rivendell Gpi // Edit a Rivendell Gpi
// //
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -239,7 +239,7 @@ int EditGpi::exec(RDMatrix::GpioType type,int id)
void EditGpi::selectOnData() void EditGpi::selectOnData()
{ {
int oncart=edit_onmacro_edit->text().toInt(); int oncart=edit_onmacro_edit->text().toInt();
if(admin_cart_dialog->exec(&oncart,RDCart::Macro,QString(),NULL)==0) { if(admin_cart_dialog->exec(&oncart,RDCart::Macro,QString(),NULL)) {
if(oncart>0) { if(oncart>0) {
RDCart *rdcart=new RDCart(oncart); RDCart *rdcart=new RDCart(oncart);
edit_onmacro_edit->setText(QString::asprintf("%06d",oncart)); edit_onmacro_edit->setText(QString::asprintf("%06d",oncart));
@ -264,7 +264,7 @@ void EditGpi::clearOnData()
void EditGpi::selectOffData() void EditGpi::selectOffData()
{ {
int offcart=edit_offmacro_edit->text().toInt(); int offcart=edit_offmacro_edit->text().toInt();
if(admin_cart_dialog->exec(&offcart,RDCart::Macro,QString(),NULL)==0) { if(admin_cart_dialog->exec(&offcart,RDCart::Macro,QString(),NULL)) {
if(offcart>0) { if(offcart>0) {
RDCart *rdcart=new RDCart(offcart); RDCart *rdcart=new RDCart(offcart);
edit_offmacro_edit->setText(QString::asprintf("%06d",offcart)); edit_offmacro_edit->setText(QString::asprintf("%06d",offcart));