summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-02-01 15:11:39 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2002-02-01 15:11:39 +0100
commit103124c82c8d1ae23fc46cf1c18f050b4721dbcb (patch)
treef8756e69dbc5723a9e27d885611b03d4a4c9e6b0
parent9a64e7a818ee565ec0a6ee8e834a69ccc48a59f3 (diff)
downloadvdr-103124c82c8d1ae23fc46cf1c18f050b4721dbcb.tar.gz
vdr-103124c82c8d1ae23fc46cf1c18f050b4721dbcb.tar.bz2
Fixed handling hierarchical recordings menu in case of directories starting with the same sequence of characters
-rw-r--r--HISTORY2
-rw-r--r--menu.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 755f7624..d3f3ed4f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -934,3 +934,5 @@ Video Disk Recorder Revision History
2002-02-01: Version 0.99pre5
- Updated channel settings for 'N24' (thanks to Andreas Gebel).
+- Fixed handling hierarchical recordings menu in case of directories starting
+ with the same sequence of characters.
diff --git a/menu.c b/menu.c
index 1cd54915..abc8d45f 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.146 2002/01/27 15:50:50 kls Exp $
+ * $Id: menu.c 1.147 2002/02/01 15:08:44 kls Exp $
*/
#include "menu.h"
@@ -1553,7 +1553,7 @@ cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
cMenuRecordingItem *LastItem = NULL;
char *LastItemText = NULL;
for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
- if (!Base || strstr(recording->Name(), Base) == recording->Name()) {
+ if (!Base || (strstr(recording->Name(), Base) == recording->Name() && recording->Name()[strlen(Base)] == '~')) {
cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
if (*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0)) {
Add(Item);