summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-09-21 16:01:45 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2001-09-21 16:01:45 +0200
commit7fc8b39f430c5942a6d1f98f9177a2c969b33e42 (patch)
treeecb881ea00ec3c104312e007e52787ef689b3f1b
parent9309c176e9b7421516257ee54f250f72518a0d4d (diff)
downloadvdr-7fc8b39f430c5942a6d1f98f9177a2c969b33e42.tar.gz
vdr-7fc8b39f430c5942a6d1f98f9177a2c969b33e42.tar.bz2
Fixed timeout when pressing '0' to set an editing mark while the progress display is not shown
-rw-r--r--HISTORY3
-rw-r--r--menu.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/HISTORY b/HISTORY
index 5b4fdcca..dfc939e0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -766,4 +766,5 @@ Video Disk Recorder Revision History
DVD support!
- Several fixes to the replay mode display (thanks to Stefan Huelswitt):
no more replay mode display when pressing the "Green" or "Yellow" button
- (Skip +/-60s);
+ (Skip +/-60s); fixed timeout when pressing '0' to set an editing mark while
+ the progress display is not shown;
diff --git a/menu.c b/menu.c
index 19665800..ebbec6b5 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 1.121 2001/09/21 15:01:43 kls Exp $
+ * $Id: menu.c 1.122 2001/09/21 15:46:21 kls Exp $
*/
#include "menu.h"
@@ -2388,8 +2388,7 @@ void cReplayControl::Show(int Seconds)
{
if (!visible) {
shown = ShowProgress(true);
- if (shown && Seconds > 0)
- timeoutShow = time(NULL) + Seconds;
+ timeoutShow = (shown && Seconds > 0) ? time(NULL) + Seconds : 0;
}
}
@@ -2427,7 +2426,8 @@ void cReplayControl::ShowMode(void)
visible = modeOnly = true;
}
- timeoutShow = (modeOnly && !timeoutShow && Speed == -1 && Play) ? time(NULL) + MODETIMEOUT : 0;
+ if (modeOnly && !timeoutShow && Speed == -1 && Play)
+ timeoutShow = time(NULL) + MODETIMEOUT;
const char *Mode;
if (Speed == -1) Mode = Play ? " > " : " || ";
else if (Play) Mode = Forward ? " X>> " : " <<X ";