2 files changed, 7 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index cd80537d..5b4a35bf 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5694,7 +5694,7 @@ Video Disk Recorder Revision History
   standard ETSI EN 300 468) to ISO-8859-9, in order to work around the stupidity of
   some providers, who actually use ISO-8859-9, but fail to correctly announce that.
 
-2008-03-14: Version 1.5.18
+2008-03-16: Version 1.5.18
 
 - Added a missing reset of maxNumber in cChannels::Renumber() (reported by Sundararaj
   Reel).
@@ -5720,3 +5720,4 @@ Video Disk Recorder Revision History
   Ahrenberg).
 - Fixed tuning to a live channel after a recording has been stopped using the
   'Back' key.
+- Resetting a timer's 'pending' flag when it has ended.
diff --git a/menu.c b/menu.c
index b7a21af7..b7eab456 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.481 2008/03/14 13:09:19 kls Exp $
+ * $Id: menu.c 1.482 2008/03/16 11:15:28 kls Exp $
  */
 
 #include "menu.h"
@@ -3879,8 +3879,11 @@ void cRecordControl::Stop(void)
 
 bool cRecordControl::Process(time_t t)
 {
-  if (!recorder || !recorder->IsAttached() || !timer || !timer->Matches(t))
+  if (!recorder || !recorder->IsAttached() || !timer || !timer->Matches(t)) {
+     if (timer)
+        timer->SetPending(false);
      return false;
+     }
   AssertFreeDiskSpace(timer->Priority());
   return true;
 }