diff --git a/ChangeLog b/ChangeLog index 09b4cad2..bd6b318f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16995,3 +16995,6 @@ 2018-05-31 Patrick Linstruth * Implemented purging of STACK_* tables for RDMaint(1) in 'utils/rdmaint/rdmaint.cpp' and 'utils/rdmaint/rdmaint.h'. +2018-05-31 Fred Gleason + * Fixed a regression in rdcatchd(8) that caused Upload events to + be generated with the incorrect sample rate. diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp index d93c504d..173fba60 100644 --- a/rdcatchd/rdcatchd.cpp +++ b/rdcatchd/rdcatchd.cpp @@ -2019,7 +2019,7 @@ void MainObject::LoadEvent(RDSqlQuery *q,CatchEvent *e,bool add) break; } e->setChannels(q->value(20).toInt()); - e->setSampleRate(rda->system()->sampleRate()); + e->setSampleRate(q->value(21).toUInt()); e->setBitrate(q->value(22).toInt()); e->setMacroCart(q->value(23).toInt()); e->setSwitchInput(q->value(24).toInt());