1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Now stopping any ongoing recordings before stopping the plugins

This commit is contained in:
Klaus Schmidinger 2017-03-25 14:32:37 +01:00
parent fe57c16f6f
commit 9e808255f8
2 changed files with 5 additions and 3 deletions

View File

@ -8882,7 +8882,7 @@ Video Disk Recorder Revision History
- Added a short sleep to cTSBuffer::Action() to avoid high CPU usage (thanks to - Added a short sleep to cTSBuffer::Action() to avoid high CPU usage (thanks to
Sergey Chernyavskiy). Sergey Chernyavskiy).
2017-03-19: Version 2.3.3 2017-03-25: Version 2.3.3
- Added 'S3W ABS-3A' to sources.conf (thanks to Frank Richter). - Added 'S3W ABS-3A' to sources.conf (thanks to Frank Richter).
- Fixed a possible deadlock in the recordings handler thread. - Fixed a possible deadlock in the recordings handler thread.
@ -8920,3 +8920,5 @@ Video Disk Recorder Revision History
what a derived cCamSlot class needs to do in order to activate MTD. what a derived cCamSlot class needs to do in order to activate MTD.
- The function cRingBufferLinear::Clear() can now be called safely from the - The function cRingBufferLinear::Clear() can now be called safely from the
reading thread, without additional locking. reading thread, without additional locking.
- Now stopping any ongoing recordings before stopping the plugins, to avoid
a crash when stopping VDR while recording.

4
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.tvdr.de * The project's page is at http://www.tvdr.de
* *
* $Id: vdr.c 4.10 2017/01/09 13:22:09 kls Exp $ * $Id: vdr.c 4.11 2017/03/25 14:20:30 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -1560,8 +1560,8 @@ Exit:
StopSVDRPClientHandler(); StopSVDRPClientHandler();
StopSVDRPServerHandler(); StopSVDRPServerHandler();
ChannelCamRelations.Save(); ChannelCamRelations.Save();
PluginManager.StopPlugins();
cRecordControls::Shutdown(); cRecordControls::Shutdown();
PluginManager.StopPlugins();
RecordingsHandler.DelAll(); RecordingsHandler.DelAll();
delete Menu; delete Menu;
cControl::Shutdown(); cControl::Shutdown();