diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2015-09-13 13:57:51 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2015-09-13 13:57:51 +0200 |
commit | bfc3f1f4b2be0cad91d3aa8781c564ff20927063 (patch) | |
tree | a32ab036015018fa2999c942376b48a53b243e50 /timers.c | |
parent | 2b20b9e064413cec0d6999ed545ebd7d9c7b1f2c (diff) | |
download | vdr-bfc3f1f4b2be0cad91d3aa8781c564ff20927063.tar.gz vdr-bfc3f1f4b2be0cad91d3aa8781c564ff20927063.tar.bz2 |
Fixed moving currently recording timers between machines
Diffstat (limited to 'timers.c')
-rw-r--r-- | timers.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: timers.c 4.4 2015/09/09 10:42:18 kls Exp $ + * $Id: timers.c 4.5 2015/09/13 13:10:24 kls Exp $ */ #include "timers.h" @@ -33,7 +33,7 @@ cTimer::cTimer(bool Instant, bool Pause, const cChannel *Channel) flags = tfNone; *file = 0; aux = NULL; - remote = *Setup.SVDRPDefaultHost ? strdup(Setup.SVDRPDefaultHost) : NULL; + remote = NULL; event = NULL; if (Instant) SetFlags(tfActive | tfInstant); @@ -91,7 +91,7 @@ cTimer::cTimer(const cEvent *Event) flags = tfActive; *file = 0; aux = NULL; - remote = *Setup.SVDRPDefaultHost ? strdup(Setup.SVDRPDefaultHost) : NULL; + remote = NULL; event = NULL; if (Event->Vps() && Setup.UseVps) SetFlags(tfVps); @@ -142,14 +142,13 @@ cTimer& cTimer::operator= (const cTimer &Timer) { if (&Timer != this) { id = Timer.id; - uint OldFlags = flags & tfRecording; startTime = Timer.startTime; stopTime = Timer.stopTime; scheduleState = -1; deferred = 0; pending = Timer.pending; inVpsMargin = Timer.inVpsMargin; - flags = Timer.flags | OldFlags; + flags = Timer.flags; channel = Timer.channel; day = Timer.day; weekdays = Timer.weekdays; |