From 9b840b07c434702a3b39aae79c1c001fa4f7a66a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 20 Apr 2002 09:23:02 +0200
Subject: [PATCH] Fixed a crash when selecting the 'Jump' function directly
 after setting an editing mark

---
 CONTRIBUTORS | 6 ++++++
 HISTORY      | 5 ++++-
 menu.c       | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0ab5055b..8bd2b7b3 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -120,6 +120,8 @@ Stefan Huelswitt <huels@iname.com>
  for implementing backtracing for fast forward/rewind
  for implementing the replay mode display
  for fixing a crash when replaying with DEBUG_OSD=1
+ for fixing a crash when selecting the "Jump" function directly after setting
+ an editing mark
 
 Ulrich Röder <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
@@ -293,3 +295,7 @@ Andreas Roedl <flood@flood-net.de>
 
 Jean Martin <mac_j_fr@hotmail.com>
  for pointing out a problem with OSD color palette handling on "big endian" systems
+
+Steffen Koch <Steffen.Koch@koch-enterprises.de>
+ for reporting a crash when selecting the "Jump" function directly after setting
+ an editing mark
diff --git a/HISTORY b/HISTORY
index 49d94a05..ef3b0865 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1191,7 +1191,7 @@ Video Disk Recorder Revision History
   same name was manually deleted on a system with more than one video directory
   (thanks to Dirk Wiebel for reporting this one).
 
-2002-04-19: Version 1.0.1
+2002-04-20: Version 1.0.1
 
 - Added some DVB-T channels for Berlin (Germany) to channels.conf.terr (thanks to
   Andreas Roedl).
@@ -1206,3 +1206,6 @@ Video Disk Recorder Revision History
   'channels.conf').
 - Improved thread locking in the ring buffer to avoid possible race conditions
   under heavy load (thanks to Werner Fink).
+- Fixed a crash when selecting the "Jump" function directly after setting an
+  editing mark (thanks to Steffen Koch for reporting and Stefan Huelswitt for
+  fixing this one).
diff --git a/menu.c b/menu.c
index 147ef735..ed219cdd 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.186 2002/04/20 09:06:51 kls Exp $
+ * $Id: menu.c 1.187 2002/04/20 09:17:08 kls Exp $
  */
 
 #include "menu.h"
@@ -3282,6 +3282,7 @@ void cReplayControl::TimeSearch(void)
      else
         return;
      }
+  timeoutShow = 0;
   TimeSearchDisplay();
   timeSearchActive = true;
 }