Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-19 22:48:01 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed a regression in rdcatchd(8) that broke download events.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-11-15 15:56:41 -05:00
parent 497ccd441d
commit 63121ab15d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -23689,3 +23689,5 @@
generation on ARM architectures. generation on ARM architectures.
2022-11-15 Fred Gleason <fredg@paravelsystems.com> 2022-11-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed a typo in 'lib/rdcut.cpp' that broke cut copy/pasting. * Fixed a typo in 'lib/rdcut.cpp' that broke cut copy/pasting.
2022-11-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdcatchd(8) that broke download events.

8
rdcatchd/batch.cpp
View File

@ -168,7 +168,6 @@ void MainObject::RunImport(CatchEvent *evt)
void MainObject::RunDownload(CatchEvent *evt) void MainObject::RunDownload(CatchEvent *evt)
{ {
RDDownload::ErrorCode conv_err; RDDownload::ErrorCode conv_err;
int event=GetEvent(evt->id());
// //
// Resolve Wildcards // Resolve Wildcards
@ -218,8 +217,7 @@ void MainObject::RunDownload(CatchEvent *evt)
exit(0); exit(0);
default: default:
WriteExitCode(event,RDRecording::ServerError, WriteExitCode(evt,RDRecording::ServerError,RDDownload::errorText(conv_err));
RDDownload::errorText(conv_err));
qApp->processEvents(); qApp->processEvents();
rda->syslog(LOG_WARNING,"download of %s returned an error: \"%s\", id=%d", rda->syslog(LOG_WARNING,"download of %s returned an error: \"%s\", id=%d",
(const char *)evt->tempName().toUtf8(), (const char *)evt->tempName().toUtf8(),
@ -235,13 +233,13 @@ void MainObject::RunDownload(CatchEvent *evt)
// Execute Import // Execute Import
// //
if(Import(evt)) { if(Import(evt)) {
WriteExitCode(event,RDRecording::Ok,tr("OK")); WriteExitCode(evt,RDRecording::Ok,tr("OK"));
qApp->processEvents(); qApp->processEvents();
} }
rda->syslog(LOG_INFO,"deleting file %s, id=%d", rda->syslog(LOG_INFO,"deleting file %s, id=%d",
(const char *)evt->tempName().toUtf8(),evt->id()); (const char *)evt->tempName().toUtf8(),evt->id());
unlink(evt->tempName().toUtf8()); unlink(evt->tempName().toUtf8());
WriteExitCode(event,RDRecording::Ok,"OK"); WriteExitCode(evt,RDRecording::Ok,"OK");
} }