summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-04-27 10:34:08 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2013-04-27 10:34:08 +0200
commitfa77b5c2b22e84ab253170875016e946bddf4373 (patch)
tree2604d0026ca1fd4a87ce8c8b6c4bbac64ef8cb16
parentcffde6ee0951c4ced016860901f942b674eed1c1 (diff)
downloadvdr-fa77b5c2b22e84ab253170875016e946bddf4373.tar.gz
vdr-fa77b5c2b22e84ab253170875016e946bddf4373.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 dbb5756b..aa913748 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2102,6 +2102,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 bde35ec2..9615e245 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7802,3 +7802,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 00e9d365..f43dec5d 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.82.1.1 2013/04/27 10:15:16 kls Exp $
+ * $Id: menu.c 2.82.1.2 2013/04/27 10:32:28 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;