From fa77b5c2b22e84ab253170875016e946bddf4373 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 27 Apr 2013 10:34:08 +0200 Subject: Fixed displaying the frame number when setting an editing mark --- CONTRIBUTORS | 1 + HISTORY | 2 ++ menu.c | 6 ++++-- 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 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 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; -- cgit v1.2.3