2022-03-01 Fred Gleason <fredg@paravelsystems.com>

* 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 <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-03-01 10:58:23 -05:00
parent bee47bec9e
commit 1380e152b6
2 changed files with 6 additions and 2 deletions

View File

@ -22907,3 +22907,7 @@
2022-03-01 Fred Gleason <fredg@paravelsystems.com>
* Added a RDLIBRARYMODEL_ENABLE_UPDATE_PROFILING #define switch
to 'RDLibraryModel'.
2022-03-01 Fred Gleason <fredg@paravelsystems.com>
* 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.

View File

@ -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));
}
}