Fixed a loss of a timer's 'recording' flag after modifying it via MODT

2 files changed, 4 insertions, 2 deletions

diff --git a/HISTORY b/HISTORY
index a5d3e7c3..2c5386ff 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5609,3 +5609,4 @@ Video Disk Recorder Revision History
   menu (suggested by Walter Koch).
 - Changed the message "Upcoming VPS recording!" to "Upcoming recording!" because
   it applies to non-VPS recordings as well.
+- Fixed a loss of a timer's 'recording' flag after modifying it via MODT.
diff --git a/timers.c b/timers.c
index f70ab9d1..8d20670e 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.68 2007/08/04 09:23:33 kls Exp $
+ * $Id: timers.c 1.69 2008/02/10 12:22:02 kls Exp $
  */
 
 #include "timers.h"
@@ -99,13 +99,14 @@ cTimer::~cTimer()
 cTimer& cTimer::operator= (const cTimer &Timer)
 {
   if (&Timer != this) {
+     uint OldFlags = flags & tfRecording;
      startTime    = Timer.startTime;
      stopTime     = Timer.stopTime;
      lastSetEvent = 0;
      recording    = Timer.recording;
      pending      = Timer.pending;
      inVpsMargin  = Timer.inVpsMargin;
-     flags        = Timer.flags;
+     flags        = Timer.flags | OldFlags;
      channel      = Timer.channel;
      day          = Timer.day;
      weekdays     = Timer.weekdays;