diff options
author | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2006-09-03 18:00:00 +0200 |
---|---|---|
committer | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2006-09-03 18:00:00 +0200 |
commit | c49ca5abb73cbc11447da5d961e106025dc927d0 (patch) | |
tree | 4faaa7168a60d1b4d4b468691bd7836263604248 /timers.c | |
parent | 6d6df2fddd6da0ccc9fe9a9aa5526306e9db73d7 (diff) | |
download | vdr-patch-lnbsharing-c49ca5abb73cbc11447da5d961e106025dc927d0.tar.gz vdr-patch-lnbsharing-c49ca5abb73cbc11447da5d961e106025dc927d0.tar.bz2 |
Version 1.4.2-1vdr-1.4.2-1
- Added LC_ALL to the checks for UTF-8 at startup (suggested by Matthias Schwarzott).
- Fixed the cTimer::operator=() so that it won't mess up the cListObject's pointers
(reported by Alexander Rieger).
- Fixed a memory leak in the cTimer::operator=() when using the 'aux' string
(reported by Alexander Rieger).
- Fixed processing the PDCDescriptor in 'libsi' on big endian systems (thanks to
Martin Ostermann).
- Fixed handling relative volume settings that unmute the audio in the call to
cStatus::MsgSetVolume() (reported by Oliver Endriss).
Diffstat (limited to 'timers.c')
-rw-r--r-- | timers.c | 23 |
1 files changed, 18 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 1.62 2006/08/05 12:03:36 kls Exp $ + * $Id: timers.c 1.63 2006/09/02 10:20:36 kls Exp $ */ #include "timers.h" @@ -90,11 +90,24 @@ cTimer::~cTimer() cTimer& cTimer::operator= (const cTimer &Timer) { - memcpy(this, &Timer, sizeof(*this)); - if (aux) - aux = strdup(aux); - event = NULL; + startTime = Timer.startTime; + stopTime = Timer.stopTime; lastSetEvent = 0; + recording = Timer.recording; + pending = Timer.pending; + inVpsMargin = Timer.inVpsMargin; + flags = Timer.flags; + channel = Timer.channel; + day = Timer.day; + weekdays = Timer.weekdays; + start = Timer.start; + stop = Timer.stop; + priority = Timer.priority; + lifetime = Timer.lifetime; + strncpy(file, Timer.file, sizeof(file)); + free(aux); + aux = Timer.aux ? strdup(Timer.aux) : NULL; + event = NULL; return *this; } |