diff --git a/HISTORY b/HISTORY index 23e445ef..d55dcf70 100644 --- a/HISTORY +++ b/HISTORY @@ -8882,7 +8882,7 @@ Video Disk Recorder Revision History - Added a short sleep to cTSBuffer::Action() to avoid high CPU usage (thanks to 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). - 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. - The function cRingBufferLinear::Clear() can now be called safely from the reading thread, without additional locking. +- Now stopping any ongoing recordings before stopping the plugins, to avoid + a crash when stopping VDR while recording. diff --git a/vdr.c b/vdr.c index 15dd2c02..5b598f9c 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * 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 @@ -1560,8 +1560,8 @@ Exit: StopSVDRPClientHandler(); StopSVDRPServerHandler(); ChannelCamRelations.Save(); - PluginManager.StopPlugins(); cRecordControls::Shutdown(); + PluginManager.StopPlugins(); RecordingsHandler.DelAll(); delete Menu; cControl::Shutdown();