summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2017-01-09 14:52:57 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2017-01-09 14:52:57 +0100
commit6773ab35d2e8638b906346b51f678f1090bc0454 (patch)
tree89fcc6cb60637f6dab21bfe882faeeeed90b4301
parent196f2af596509a318d4f5a83009167ea2bdcf61f (diff)
downloadvdr-6773ab35d2e8638b906346b51f678f1090bc0454.tar.gz
vdr-6773ab35d2e8638b906346b51f678f1090bc0454.tar.bz2
Fixed updating the elapsed/remaining time in the progress display during fast forward/rewind
-rw-r--r--HISTORY2
-rw-r--r--menu.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 22523c2e..0cb88d6c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8896,3 +8896,5 @@ Video Disk Recorder Revision History
- Fixed a flaw in handling timeouts for encrypted channels.
- The mechanism of trying different CAMs when switching to an encrypted channel is
now only triggered if there acually is more than one CAM in the system.
+- Fixed updating the elapsed/remaining time in the progress display during fast
+ forward/rewind.
diff --git a/menu.c b/menu.c
index 30c95f8d..f784d16f 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 4.19 2016/12/22 11:00:13 kls Exp $
+ * $Id: menu.c 4.20 2017/01/09 14:45:50 kls Exp $
*/
#include "menu.h"
@@ -5584,7 +5584,7 @@ void cReplayControl::ShowMode(void)
bool cReplayControl::ShowProgress(bool Initial)
{
int Current, Total;
- if (Initial || time(NULL) - lastProgressUpdate >= 1) {
+ if (Initial || lastSpeed != -1 || time(NULL) - lastProgressUpdate >= 1) {
if (GetFrameNumber(Current, Total) && Total > 0) {
if (!visible) {
displayReplay = Skins.Current()->DisplayReplay(modeOnly);