summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-03-03 15:03:09 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2012-03-03 15:03:09 +0100
commitf35e4acf887a7fa065d0c2addc0a33a3885b1ae0 (patch)
tree90b324e1dadf9be75aa87defdea302ce9d8d24c9
parent31cca0c85bccb50b36706954afc5266d164347dd (diff)
downloadvdr-f35e4acf887a7fa065d0c2addc0a33a3885b1ae0.tar.gz
vdr-f35e4acf887a7fa065d0c2addc0a33a3885b1ae0.tar.bz2
Toggling a mark now restarts the timeout of the replay progress display
-rw-r--r--HISTORY1
-rw-r--r--menu.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 652e41ff..ccba0cd1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6967,3 +6967,4 @@ Video Disk Recorder Revision History
Frank Neumann).
- The replay progress display is now turned on whenever a mark is toggled (not
only when one is set).
+- Toggling a mark now restarts the timeout of the replay progress display.
diff --git a/menu.c b/menu.c
index c1f48e59..9ead8a59 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.40 2012/03/03 14:47:32 kls Exp $
+ * $Id: menu.c 2.41 2012/03/03 15:00:41 kls Exp $
*/
#include "menu.h"
@@ -4513,6 +4513,8 @@ void cReplayControl::ShowTimed(int Seconds)
shown = ShowProgress(true);
timeoutShow = (shown && Seconds > 0) ? time(NULL) + Seconds : 0;
}
+ else if (timeoutShow && Seconds > 0)
+ timeoutShow = time(NULL) + Seconds;
}
void cReplayControl::Show(void)
@@ -4531,6 +4533,7 @@ void cReplayControl::Hide(void)
lastPlay = lastForward = false;
lastSpeed = -2; // an invalid value
timeSearchActive = false;
+ timeoutShow = 0;
}
}