diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2007-10-19 14:46:23 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2007-10-19 14:46:23 +0200 |
| commit | cd6041f9ae78cac1eb910fb03460f723810c225f (patch) | |
| tree | cb2f961321a73bc9a43ae60cd6ea84305e8845de | |
| parent | 1e4c80799fd17b1b0841d7108ee752b685f72dba (diff) | |
| download | vdr-cd6041f9ae78cac1eb910fb03460f723810c225f.tar.gz vdr-cd6041f9ae78cac1eb910fb03460f723810c225f.tar.bz2 | |
Housekeeping now waits for a while after a replay has ended
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | vdr.c | 6 |
3 files changed, 6 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 2989cbf9..95743cdf 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1537,6 +1537,7 @@ Udo Richter <udo_richter@gmx.de> for reporting a problem in handling reallocated memory in cCharSetConv::Convert() for fixing a new[]/delete mismatch in cMenuEditStrItem::LeaveEditMode() for improving shutdown handling + for making housekeeping wait for a while after a replay has ended Sven Kreiensen <svenk@kammer.uni-hannover.de> for his help in keeping 'channels.conf.terr' up to date @@ -5498,3 +5498,4 @@ Video Disk Recorder Revision History - The "Play" key now starts replay of the selected recording in the Recordings menu (thanks to Ville Skyttä); - Improved shutdown handling (thanks to Udo Richter). +- Housekeeping now waits for a while after a replay has ended (thanks to Udo Richter). @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.300 2007/09/26 14:36:48 kls Exp $ + * $Id: vdr.c 1.301 2007/10/19 14:44:19 kls Exp $ */ #include <getopt.h> @@ -523,6 +523,7 @@ int main(int argc, char *argv[]) int PreviousChannel[2] = { 1, 1 }; int PreviousChannelIndex = 0; time_t LastChannelChanged = time(NULL); + time_t LastInteract = 0; int MaxLatencyTime = 0; bool InhibitEpgScan = false; bool IsInfoMenu = false; @@ -1069,6 +1070,7 @@ int main(int argc, char *argv[]) } Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time if (Interact) { + LastInteract = Now; eOSState state = Interact->ProcessKey(key); if (state == osUnknown && Interact != cControl::Control()) { if (ISMODELESSKEY(key) && cControl::Control()) { @@ -1195,7 +1197,7 @@ int main(int argc, char *argv[]) ShutdownHandler.countdown.Cancel(); } - if (!Interact && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) { + if ((Now - LastInteract) > ACTIVITYTIMEOUT && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) { // Handle housekeeping tasks // Shutdown: |