2022-09-11 Fred Gleason <fredg@paravelsystems.com>

* Fixed a regression in rdadmin(1) that made it impossible to set
	a 'Startup Cart' button using the 'Select' button.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-09-11 16:03:32 -04:00
parent 0f2c136700
commit d91ea3dae3
3 changed files with 6 additions and 1 deletions

View File

@ -23287,3 +23287,6 @@
* Modified the JACK driver in caed(8) to define the
'JACK_NO_AUDIO_RESERVATION' in the environment before starting
jackd(1).
2022-09-11 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdadmin(1) that made it impossible to set
a 'Startup Cart' button using the 'Select' button.

View File

@ -205,6 +205,8 @@ int RDCartDialog::exec(int *cartnum,RDCart::Type type,const QString &svc,
if(cart_cartnum!=NULL) {
QModelIndex index=cart_cart_model->cartRow(*cart_cartnum);
cart_cart_view->selectRow(index.row());
cart_ok_button->
setEnabled(cart_cart_view->selectionModel()->selectedRows().size()>0);
}
return QDialog::exec();

View File

@ -559,7 +559,7 @@ void EditStation::selectClicked()
{
int cartnum=station_startup_cart_edit->text().toInt();
if(admin_cart_dialog->exec(&cartnum,RDCart::Macro,QString(),NULL)==0) {
if(admin_cart_dialog->exec(&cartnum,RDCart::Macro,QString(),NULL)) {
station_startup_cart_edit->setText(QString::asprintf("%06d",cartnum));
}
}