From c984204944281a4c9826e963f29d3c52b526896d Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Thu, 17 Jan 2013 14:24:58 +0100 Subject: [PATCH] Absolute jumps when replaying a recording (via the Red key) are now only performed if an actual value has been entered --- CONTRIBUTORS | 2 ++ HISTORY | 4 +++- menu.c | 8 +++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c457b196..411ad952 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2509,6 +2509,8 @@ Ulf Kiener for reporting a problem with audio track descriptions in the DVD plugin after a replay has been stopped for suggesting to add user defined key kUser0 + for suggesting to perform absolute jumps when replaying a recording (via the Red key) + only if an actual value has been entered Jörg Wendel for reporting that cPlugin::Active() was called too often diff --git a/HISTORY b/HISTORY index 4213ccdf..0e21efee 100644 --- a/HISTORY +++ b/HISTORY @@ -7494,7 +7494,7 @@ Video Disk Recorder Revision History use it. - Added maximum SNR value for PCTV Systems PCTV 73ESE (thanks to Cedric Dewijs). -2013-01-16: Version 1.7.36 +2013-01-17: Version 1.7.36 - Added maximum SNR value for PCTV Systems nanoStick T2 290e (thanks to Antti Hartikainen). @@ -7523,3 +7523,5 @@ Video Disk Recorder Revision History - Fixed multiple occurrences of the same directory in the recordings list in case there are directories that only differ in non-alphanumeric characters (reported by Andreas Mair). +- Absolute jumps when replaying a recording (via the Red key) are now only performed + if an actual value has been entered (suggested by Ulf Kiener). diff --git a/menu.c b/menu.c index b42aa4da..d7faa872 100644 --- a/menu.c +++ b/menu.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 2.73 2013/01/16 15:58:58 kls Exp $ + * $Id: menu.c 2.74 2013/01/17 14:20:08 kls Exp $ */ #include "menu.h" @@ -4716,8 +4716,10 @@ void cReplayControl::TimeSearchProcess(eKeys Key) case kPause: case kDown: case kOk: - Seconds = min(Total - STAY_SECONDS_OFF_END, Seconds); - Goto(SecondsToFrames(Seconds, FramesPerSecond()), Key == kDown || Key == kPause || Key == kOk); + if (timeSearchPos > 0) { + Seconds = min(Total - STAY_SECONDS_OFF_END, Seconds); + Goto(SecondsToFrames(Seconds, FramesPerSecond()), Key == kDown || Key == kPause || Key == kOk); + } timeSearchActive = false; break; default: