From ff6441939659d17765fcda9aec361b39b7fc972a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 6 Nov 2005 09:44:58 +0100
Subject: Fixed setting the help key display in the Recordings menu in case of
 several layers of subdirectories

---
 HISTORY | 4 +++-
 menu.c  | 7 +++----
 menu.h  | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/HISTORY b/HISTORY
index 68cdd5c5..7a6fb361 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3913,7 +3913,7 @@ Video Disk Recorder Revision History
 - The new class cUnbufferedFile is used for the recording files to avoid
   trashing the file system cache (based on a patch by Ralf Müller).
 
-2005-11-05: Version 1.3.36
+2005-11-06: Version 1.3.36
 
 - Fixed a NULL pointer access with the cUnbufferedFile when a replay session runs
   all the way until the end of the recording (thanks to Joachim Wilke).
@@ -3936,3 +3936,5 @@ Video Disk Recorder Revision History
 - Fixed a race condition in the SPU decoder (thanks to Marco Schlüßler).
 - The EPG scan no longer disturbs players that have also set live PIDs
   (reported by Stefan Huelswitt).
+- Fixed setting the help key display in the Recordings menu in case of several
+  layers of subdirectories.
diff --git a/menu.c b/menu.c
index c280b458..0bb7598b 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.375 2005/10/09 11:22:03 kls Exp $
+ * $Id: menu.c 1.376 2005/11/05 17:29:22 kls Exp $
  */
 
 #include "menu.h"
@@ -1546,14 +1546,13 @@ void cMenuRecordingItem::IncrementCounter(bool New)
 
 // --- cMenuRecordings -------------------------------------------------------
 
-int cMenuRecordings::helpKeys = -1;
-
 cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
 :cOsdMenu(Base ? Base : tr("Recordings"), 8, 6)
 {
   base = Base ? strdup(Base) : NULL;
   level = Setup.RecordingDirs ? Level : -1;
   Recordings.StateChanged(recordingsState); // just to get the current state
+  helpKeys = -1;
   Display(); // this keeps the higher level menus from showing up briefly when pressing 'Back' during replay
   Set();
   if (Current() < 0)
@@ -1573,7 +1572,7 @@ cMenuRecordings::~cMenuRecordings()
 void cMenuRecordings::SetHelpKeys(void)
 {
   cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
-  int NewHelpKeys = helpKeys;
+  int NewHelpKeys = 0;
   if (ri) {
      if (ri->IsDirectory())
         NewHelpKeys = 1;
diff --git a/menu.h b/menu.h
index 33e05b82..729d3759 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.76 2005/10/03 10:39:08 kls Exp $
+ * $Id: menu.h 1.77 2005/11/05 17:26:09 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -150,7 +150,7 @@ private:
   char *base;
   int level;
   int recordingsState;
-  static int helpKeys;
+  int helpKeys;
   void SetHelpKeys(void);
   void Set(bool Refresh = false);
   cRecording *GetRecording(cMenuRecordingItem *Item);
-- 
cgit v1.2.3