frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Klaus Schmidinger 2008-02-10 12:25:52 +01:00
parent dcbcd18890
commit b678d5812c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -5609,3 +5609,4 @@ Video Disk Recorder Revision History
menu (suggested by Walter Koch). menu (suggested by Walter Koch).
- Changed the message "Upcoming VPS recording!" to "Upcoming recording!" because - Changed the message "Upcoming VPS recording!" to "Upcoming recording!" because
it applies to non-VPS recordings as well. it applies to non-VPS recordings as well.
- Fixed a loss of a timer's 'recording' flag after modifying it via MODT.

5
timers.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "timers.h"
@ -99,13 +99,14 @@ cTimer::~cTimer()
cTimer& cTimer::operator= (const cTimer &Timer) cTimer& cTimer::operator= (const cTimer &Timer)
{ {
if (&Timer != this) { if (&Timer != this) {
uint OldFlags = flags & tfRecording;
startTime = Timer.startTime; startTime = Timer.startTime;
stopTime = Timer.stopTime; stopTime = Timer.stopTime;
lastSetEvent = 0; lastSetEvent = 0;
recording = Timer.recording; recording = Timer.recording;
pending = Timer.pending; pending = Timer.pending;
inVpsMargin = Timer.inVpsMargin; inVpsMargin = Timer.inVpsMargin;
flags = Timer.flags; flags = Timer.flags | OldFlags;
channel = Timer.channel; channel = Timer.channel;
day = Timer.day; day = Timer.day;
weekdays = Timer.weekdays; weekdays = Timer.weekdays;