mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-05-22 07:39:35 +02:00
Fixed conflict in 'ChangeLog'
Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
commit
519a09fcee
@ -22571,5 +22571,8 @@
|
||||
2021-10-28 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Moved the 'Daylight Saving Time Considerations' section in the
|
||||
Operations Guide to after the 'The RDCatch Main Window' section.
|
||||
2021-11-23 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Fixed a regression in caed(8) that made it impossible to stop
|
||||
audio recordings manually.
|
||||
2021-11-24 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Added a '--check-strings' switch to rddbmgr(8).
|
||||
|
@ -634,7 +634,10 @@ void MainObject::stopRecordingData(int id,unsigned card,unsigned stream)
|
||||
cae_server->sendCommand(id,QString::asprintf("SR %u %u -!",card,stream));
|
||||
return;
|
||||
}
|
||||
if(!dvr->stopRecord(card,stream)) {
|
||||
if(dvr->stopRecord(card,stream)) {
|
||||
cae_server->sendCommand(id,QString::asprintf("SR %u %u +!",card,stream));
|
||||
}
|
||||
else {
|
||||
cae_server->sendCommand(id,QString::asprintf("SR %u %u -!",card,stream));
|
||||
return;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user