From 1380e152b6e91fc11ff63bbdbb4d379cdacd21e7 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 1 Mar 2022 10:58:23 -0500 Subject: [PATCH] 2022-03-01 Fred Gleason * Fixed a regression in the 'Edit Host' dialog in rdadmin(1) that caused an invalid cart to be placed in the 'Start Cart' and 'Stop Cart' fields if the cart picker dialog was canceled. Signed-off-by: Fred Gleason --- ChangeLog | 4 ++++ rdadmin/edit_station.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d2af0aa..76b5dda6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22907,3 +22907,7 @@ 2022-03-01 Fred Gleason * Added a RDLIBRARYMODEL_ENABLE_UPDATE_PROFILING #define switch to 'RDLibraryModel'. +2022-03-01 Fred Gleason + * Fixed a regression in the 'Edit Host' dialog in rdadmin(1) that + caused an invalid cart to be placed in the 'Start Cart' and + 'Stop Cart' fields if the cart picker dialog was canceled. diff --git a/rdadmin/edit_station.cpp b/rdadmin/edit_station.cpp index a2a5001c..0b2f9b49 100644 --- a/rdadmin/edit_station.cpp +++ b/rdadmin/edit_station.cpp @@ -851,7 +851,7 @@ void EditStation::startCartClickedData() { int cartnum=station_start_cart_edit->text().toUInt(); - if(admin_cart_dialog->exec(&cartnum,RDCart::Macro,QString(),NULL)==0) { + if(admin_cart_dialog->exec(&cartnum,RDCart::Macro,QString(),NULL)) { station_start_cart_edit->setText(QString::asprintf("%06d",cartnum)); } } @@ -861,7 +861,7 @@ void EditStation::stopCartClickedData() { int cartnum=station_stop_cart_edit->text().toUInt(); - if(admin_cart_dialog->exec(&cartnum,RDCart::Macro,QString(),NULL)==0) { + if(admin_cart_dialog->exec(&cartnum,RDCart::Macro,QString(),NULL)) { station_stop_cart_edit->setText(QString::asprintf("%06d",cartnum)); } }