Fixed a bug when pressing the Blue button in the main menu without having displayed it1.1.12

3 files changed, 7 insertions, 3 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ad113b4f..6b8de525 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -412,6 +412,8 @@ Jeremy Hall <jhall@UU.NET>
 Oliver Endriss <o.endriss@gmx.de>
  for fixing a missing Flush() call in the remote control learning procedure
  for helping to test and debug the new channel source and DiSEqC handling
+ for reporting a bug when pressing the "Blue" button in the main menu without
+ having displayed it
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
diff --git a/HISTORY b/HISTORY
index bfa81e7c..b9140fee 100644
--- a/HISTORY
+++ b/HISTORY
@@ -93,7 +93,7 @@ Video Disk Recorder Revision History
 - The program can now run in full background mode by using the --daemon option.
 - Added a "summary" field to the timers (thanks to Carsten Koch!).
   This field can contain a descriptive text of the programme and will be
-  displayed when the "Blue" key is pressed on a recording that was created by
+  displayed when the "Blue" button is pressed on a recording that was created by
   this timer. If the text contains the special character '|', a newline will
   be inserted at that place.  When pressing "Ok" on a timer that contains a
   summary field, the summary will be displayed. To edit such a timer the "Red"
@@ -1577,3 +1577,5 @@ Video Disk Recorder Revision History
 - Improved skipping channels that are (currently) not available (thanks to Stefan
   Huelswitt).
 - Updated channels.conf.terr and channels.conf.cable (thanks to Uwe Scheffler).
+- Fixed a bug when pressing the "Blue" button in the main menu without having
+  displayed it (thanks to Oliver Endriss for reporting this one).
diff --git a/menu.c b/menu.c
index f0586c95..fcd9ba43 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.211 2002/10/06 10:36:20 kls Exp $
+ * $Id: menu.c 1.212 2002/10/06 14:08:44 kls Exp $
  */
 
 #include "menu.h"
@@ -2273,7 +2273,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                                 }
                              break;
                case kBlue:   if (!HasSubMenu())
-                                state = replaying ? osStopReplay : osReplay;
+                                state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osContinue;
                              break;
                default:      break;
                }