Fixed setting up the 'Recordings' menu in case there are several recordings with exactly the same name

2 files changed, 4 insertions, 2 deletions

diff --git a/HISTORY b/HISTORY
index b875ea99..eccc6871 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6539,3 +6539,5 @@ Video Disk Recorder Revision History
   input from Oliver Endriss).
 - Fixed reallocating memory in cTsToPes::PutTs() (suggested by Oliver Endriss).
 - Now checking the result of all realloc() calls.
+- Fixed setting up the 'Recordings' menu in case there are several recordings
+  with exactly the same name.
diff --git a/menu.c b/menu.c
index a371d820..d68a724d 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.26 2011/02/25 14:24:32 kls Exp $
+ * $Id: menu.c 2.27 2011/02/26 15:28:32 kls Exp $
  */
 
 #include "menu.h"
@@ -2276,7 +2276,7 @@ void cMenuRecordings::Set(bool Refresh)
   for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
       if (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == FOLDERDELIMCHAR)) {
          cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
-         if (*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0)) {
+         if (*Item->Text() && (!Item->IsDirectory() || (!LastItem || !LastItem->IsDirectory() || strcmp(Item->Text(), LastItemText) != 0))) {
             Add(Item);
             LastItem = Item;
             free(LastItemText);