diff --git a/ChangeLog b/ChangeLog index 17d52fe5..92bde85b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24855,3 +24855,7 @@ 2024-08-16 Fred Gleason * Fixed a bug in the RDXport service that couldcause the IMPORT call to return a 'no such cart' error when trying to create a new cart. +2024-08-16 Fred Gleason + * Fixed a bug in the 'Edit Download' dialog in rdcatch(1) that + caused the 'Username' and 'Password' controls to be disabled when + entering a URL scheme of 'https'. diff --git a/rdcatch/edit_download.cpp b/rdcatch/edit_download.cpp index 337bb6c0..da1f5ea1 100644 --- a/rdcatch/edit_download.cpp +++ b/rdcatch/edit_download.cpp @@ -309,8 +309,8 @@ void EditDownload::urlChangedData(const QString &str) { QUrl url(str); QString scheme=url.scheme(); - if((scheme=="ftp")||(scheme=="ftps")||(scheme=="http")||(scheme=="file")|| - (scheme=="scp")||(scheme=="sftp")) { + if((scheme=="ftp")||(scheme=="ftps")||(scheme=="http")||(scheme=="https")|| + (scheme=="file")||(scheme=="scp")||(scheme=="sftp")) { edit_username_label->setEnabled(true); edit_username_edit->setEnabled(true); edit_password_label->setEnabled(true); diff --git a/rdcatchd/batch.cpp b/rdcatchd/batch.cpp index 7e342fe9..50caed11 100644 --- a/rdcatchd/batch.cpp +++ b/rdcatchd/batch.cpp @@ -244,12 +244,6 @@ bool MainObject::RunDownload(CatchEvent *evt,QString *err_msg) // Execute Import // bool imported=Import(evt,err_msg); - if(imported) { - rda->syslog(LOG_NOTICE,"HERE1!"); - } - else { - rda->syslog(LOG_NOTICE,"HERE2!"); - } rda->syslog(LOG_INFO,"deleting file %s, id=%d", evt->tempName().toUtf8().constData(),evt->id()); unlink(evt->tempName().toUtf8()); @@ -437,6 +431,7 @@ bool MainObject::Import(CatchEvent *evt,QString *err_msg) delete cut; return false; } + RDWaveFile *wave=new RDWaveFile(evt->tempName()); if(!wave->openWave()) { rda->syslog(LOG_ERR,"unknown file format: %s, id: %d",