summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-03-16 10:39:16 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2013-03-16 10:39:16 +0100
commit66a2bf990697da74e1b6c6f334a12fc5298cee59 (patch)
tree162b5610af39d98131ea1168ab0a1a5fc9fdd7c6
parent9bd2b9901f1323ecef3ff54663d2c8f1bf639c18 (diff)
downloadvdr-66a2bf990697da74e1b6c6f334a12fc5298cee59.tar.gz
vdr-66a2bf990697da74e1b6c6f334a12fc5298cee59.tar.bz2
Fixed creating a new VPS timer with the SVDRP command NEWT1.7.41
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY4
-rw-r--r--timers.c4
3 files changed, 6 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 79ef49ea..bd275cd0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2739,6 +2739,7 @@ Johann Friedrichs <johann.friedrichs@web.de>
for fixing a busy loop when moving editing marks
for making cPalette::ClosestColor() treat fully transparent colors as "equal"
for implementing scaling of SPU bitmaps
+ for fixing creating a new VPS timer with the SVDRP command NEWT
Timo Helkio <timolavi@mbnet.fi>
for reporting a hangup when replaying a TS recording with subtitles activated
diff --git a/HISTORY b/HISTORY
index 02fb88b2..0b9e6a2d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7730,7 +7730,7 @@ Video Disk Recorder Revision History
to avoid problems with SD-FF cards in case the user switches to the "ST:TNG" or
"Classic" skin.
-2013-03-15: Version 1.7.41
+2013-03-16: Version 1.7.41
- Updated the Hungarian OSD texts (thanks to István Füley).
- Updated the Russian OSD texts (thanks to Oleg Roitburd).
@@ -7754,3 +7754,5 @@ Video Disk Recorder Revision History
HOME, USER, LOGNAME and SHELL accordingly (thanks to Manuel Reimer).
- Updated the help and man page entry about the location of the epg.data file (thanks
to Ville Skyttä).
+- Fixed creating a new VPS timer with the SVDRP command NEWT (thanks to Johann
+ Friedrichs).
diff --git a/timers.c b/timers.c
index 16cf8cef..279f5532 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 2.16 2013/02/05 11:13:20 kls Exp $
+ * $Id: timers.c 2.17 2013/03/16 10:37:10 kls Exp $
*/
#include "timers.h"
@@ -43,7 +43,7 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
weekdays = 0;
start = now->tm_hour * 100 + now->tm_min;
stop = 0;
- if (!Setup.InstantRecordTime && channel) {
+ if (!Setup.InstantRecordTime && channel && (Instant || Pause)) {
cSchedulesLock SchedulesLock;
if (const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock)) {
if (const cSchedule *Schedule = Schedules->GetSchedule(channel)) {