diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2012-10-03 12:58:02 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2012-10-03 12:58:02 +0200 |
| commit | 5a407d0e68c8b0ef00613f6839aeadbf6b92224a (patch) | |
| tree | 9b02ad3923eb954f3f0dccc36ffff87830795f05 | |
| parent | 90d854c0b4101bbe760b2f1bb86ec004d04d7712 (diff) | |
| download | vdr-5a407d0e68c8b0ef00613f6839aeadbf6b92224a.tar.gz vdr-5a407d0e68c8b0ef00613f6839aeadbf6b92224a.tar.bz2 | |
cIoThrottle::Engaged() is now also checked in cRemoveDeletedRecordingsThread::Action()
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | recording.c | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 42824d73..8b05c1c9 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1757,6 +1757,7 @@ Udo Richter <udo_richter@gmx.de> for adding the option --outputonly to the dvbsddevice plugin for adding a missing template specification to the c'tor of cSortedTimers for contributing to a patch that implements FHS support + for suggesting to check cIoThrottle::Engaged() in cRemoveDeletedRecordingsThread::Action() Sven Kreiensen <svenk@kammer.uni-hannover.de> for his help in keeping 'channels.conf.terr' up to date @@ -7277,3 +7277,6 @@ Video Disk Recorder Revision History - Pressing the Play key during normal live viewing mode now opens the Recordings menu if there is no "last viewed" recording (thanks to Alexander Wenzel). The same behavior has been implemented for the Blue key in the main menu. +- cIoThrottle::Engaged() is now also checked in cRemoveDeletedRecordingsThread::Action(), + to suspend removing deleted recordings in case this is necessary to make room for + new, ongoing recordings (suggested by Udo Richter). diff --git a/recording.c b/recording.c index 1eeb82d0..8600e077 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 2.64 2012/09/30 13:05:14 kls Exp $ + * $Id: recording.c 2.65 2012/10/03 12:52:13 kls Exp $ */ #include "recording.h" @@ -97,6 +97,8 @@ void cRemoveDeletedRecordingsThread::Action(void) bool deleted = false; cThreadLock DeletedRecordingsLock(&DeletedRecordings); for (cRecording *r = DeletedRecordings.First(); r; ) { + if (cIoThrottle::Engaged()) + return; if (r->Deleted() && time(NULL) - r->Deleted() > DELETEDLIFETIME) { cRecording *next = DeletedRecordings.Next(r); r->Remove(); |