diff --git a/ChangeLog b/ChangeLog index 31f03a48..e00a04eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18920,3 +18920,6 @@ on the stack. 2019-08-12 Fred Gleason <fredg@paravelsystems.com> * Added 'py-compile' to the 'CLEANFILES' rule in 'Makefile.am'. +2019-08-29 Patrick Linstruth <patrick@deltecent.com> + * Modified caed(8) to skip JACK startup, rather than crash, if + no command line is specified in rdadmin(1). diff --git a/cae/cae_jack.cpp b/cae/cae_jack.cpp index 03313bcf..0251f96f 100644 --- a/cae/cae_jack.cpp +++ b/cae/cae_jack.cpp @@ -492,18 +492,24 @@ void MainObject::jackInit(RDStation *station) if(station->startJack()) { QStringList args= station->jackCommandLine().split(" ",QString::SkipEmptyParts); - QString program=args.at(0); - args.removeFirst(); - QProcess *proc=new QProcess(this); - proc->start(program,args); - if(proc->waitForStarted()) { - RDApplication::syslog(rd_config,LOG_INFO,"JACK server started"); + if(args.size()) { + QString program=args.at(0); + args.removeFirst(); + QProcess *proc=new QProcess(this); + proc->start(program,args); + if(proc->waitForStarted()) { + RDApplication::syslog(rd_config,LOG_INFO,"JACK server started"); + } + else { + RDApplication::syslog(rd_config,LOG_WARNING, + "failed to start JACK server"); + } + sleep(1); } else { - RDApplication::syslog(rd_config,LOG_WARNING, - "failed to start JACK server"); + RDApplication::syslog(rd_config,LOG_WARNING, + "could not start JACK server: no command line specified"); } - sleep(1); } //