From cb8dfb1c38b5ee8efb71151da00214437740e5f0 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 23 May 2022 14:14:36 -0400 Subject: [PATCH] 2022-05-23 Fred Gleason * 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 --- ChangeLog | 3 +++ rdadmin/edit_gpi.cpp | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd3561f0..6936bfeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23158,3 +23158,6 @@ 2022-05-23 Fred Gleason * Fixed a bug in the 'SAS USI' switcher driver in ripcd(8) that could cause a segfault upon receipt of a network error. +2022-05-23 Fred Gleason + * Fixed a regression in rdadmin(1) in the 'Edit GPIs' dialog that + caused changes in macro cart assignments to fail to be saved. diff --git a/rdadmin/edit_gpi.cpp b/rdadmin/edit_gpi.cpp index db88b26b..1977386e 100644 --- a/rdadmin/edit_gpi.cpp +++ b/rdadmin/edit_gpi.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Gpi // -// (C) Copyright 2002-2021 Fred Gleason +// (C) Copyright 2002-2022 Fred Gleason // // 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 @@ -239,7 +239,7 @@ int EditGpi::exec(RDMatrix::GpioType type,int id) void EditGpi::selectOnData() { 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) { RDCart *rdcart=new RDCart(oncart); edit_onmacro_edit->setText(QString::asprintf("%06d",oncart)); @@ -264,7 +264,7 @@ void EditGpi::clearOnData() void EditGpi::selectOffData() { 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) { RDCart *rdcart=new RDCart(offcart); edit_offmacro_edit->setText(QString::asprintf("%06d",offcart));