Fixed showing the replay mode if the OSD is currently in use

3 files changed, 7 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index bd3a74a7..3f6939f6 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1073,3 +1073,6 @@ Mike parker <vdr@msatt.freeserve.co.uk>
 Dick Streefland <Dick.Streefland@xs4all.nl>
  for fixing a crash in case the last line in channels.conf is a group separator and
  that group is selected in the channel display
+
+Kimmo Tykkala <tykkala@iki.fi>
+ for pointing out a problem in showing the replay mode if the OSD is currently in use
diff --git a/HISTORY b/HISTORY
index 9cd27891..ca415996 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3007,3 +3007,5 @@ Video Disk Recorder Revision History
   to finding out that this was the basic problem causing buffer overflows).
 - Improved Transfer Mode (thanks to Marco Schlüßler for suggestions and testing).
 - Fixed a possible crash with inconsistent SI data (thanks to Marcel Wiesweg).
+- Fixed showing the replay mode if the OSD is currently in use (thanks to Kimmo
+  Tykkala for pointing out this problem).
diff --git a/menu.c b/menu.c
index 512cd3a9..8fc67739 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.311 2004/08/08 14:29:14 kls Exp $
+ * $Id: menu.c 1.312 2004/10/16 10:24:11 kls Exp $
  */
 
 #include "menu.h"
@@ -3081,7 +3081,7 @@ void cReplayControl::Hide(void)
 
 void cReplayControl::ShowMode(void)
 {
-  if (visible || Setup.ShowReplayMode) {
+  if (visible || Setup.ShowReplayMode && !cOsd::IsOpen()) {
      bool Play, Forward;
      int Speed;
      if (GetReplayMode(Play, Forward, Speed) && (!visible || Play != lastPlay || Forward != lastForward || Speed != lastSpeed)) {