summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-04-27 10:31:23 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2013-04-27 10:31:23 +0200
commit29537da370492e1e9c7cb3de30a9138a3abb6bf1 (patch)
treeb4bb67680a5e32d3ef39acc0b1c78c2018307415
parentcbe854262215c6f700814a0dbd59b4de644d3c46 (diff)
downloadvdr-29537da370492e1e9c7cb3de30a9138a3abb6bf1.tar.gz
vdr-29537da370492e1e9c7cb3de30a9138a3abb6bf1.tar.bz2
Fixed displaying the frame number when setting an editing mark
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY2
-rw-r--r--menu.c6
3 files changed, 7 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f7f3b065..d8b49fda 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2103,6 +2103,7 @@ Thomas Günther <tom1@toms-cafe.de>
for suggesting to make the 'Allowed' parameter in cMenuEditStrItem() NULL by default,
which results in using tr(FileNameChars)
for fixing handling "none" color entries in XPM files
+ for fixing displaying the frame number when setting an editing mark
David Woodhouse <dwmw2@infradead.org>
for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
diff --git a/HISTORY b/HISTORY
index 74c6ac94..43c091e1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7825,3 +7825,5 @@ Video Disk Recorder Revision History
"Fixed selecting the last replayed recording in the Recordings menu in case there
are folders and plain recordings with names that differ only in non-alphanumeric
characters" in version 1.7.36).
+- Fixed displaying the frame number when setting an editing mark (thanks to Thomas
+ Günther).
diff --git a/menu.c b/menu.c
index 8c6d0d21..dcfaecca 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 3.1 2013/04/25 12:51:24 kls Exp $
+ * $Id: menu.c 3.2 2013/04/27 10:25:51 kls Exp $
*/
#include "menu.h"
@@ -4777,8 +4777,10 @@ void cReplayControl::MarkToggle(void)
marks.Add(Current);
bool Play, Forward;
int Speed;
- if (Setup.PauseOnMarkSet || GetReplayMode(Play, Forward, Speed) && !Play)
+ if (Setup.PauseOnMarkSet || GetReplayMode(Play, Forward, Speed) && !Play) {
Goto(Current, true);
+ displayFrames = true;
+ }
}
ShowTimed(2);
marksModified = true;