From 0de4b0b043f75725487b3db77b8e176273ff418a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 5 Feb 2006 12:39:37 +0100
Subject: Fixed multiple entries of the same subdirectory in the "Recordings"
 menu

---
 CONTRIBUTORS | 2 ++
 HISTORY      | 4 +++-
 recording.c  | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 96d75af2..fca351cd 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -884,6 +884,8 @@ Christian Jacobsen <christian.jacobsen@stageholding.de>
  for reporting a problem in case a station defines all 32 audio PIDs
  for suggestions and experiments regarding the buffer reserve in cTransfer
  for reporting a problem with 'summary.vdr' files with more than two empty lines
+ for reporting a problem with multiple entries of the same subdirectory in the
+ "Recordings" menu
 
 Andreas Mair <Andreas.Mair@linogate.com>
  for reporting a short display of the main menu if a plugin displays its own OSD and
diff --git a/HISTORY b/HISTORY
index d11f2c74..a9498ab6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4271,7 +4271,7 @@ Video Disk Recorder Revision History
 - Separated the 'install' target into several individual targets; renamed the
   'plugins-install' target to 'install-plugins' (thanks to Helmut Auer).
 
-2006-02-04: Version 1.3.42
+2006-02-05: Version 1.3.42
 
 - Removed leftover 'needsBufferReserve' variable from cTransfer (thanks to Marco
   Schlüßler).
@@ -4303,3 +4303,5 @@ Video Disk Recorder Revision History
 - The 'runvdr' script no longer uses the $VDRUSR environment variable to set
   the user id under which 'vdr' shall run. Just add the '-u username' option
   when you call 'runvdr'.
+- Fixed multiple entries of the same subdirectory in the "Recordings" menu
+  (reported by Christian Jacobsen).
diff --git a/recording.c b/recording.c
index 5c57e187..e7efba0b 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.133 2006/01/20 17:18:59 kls Exp $
+ * $Id: recording.c 1.134 2006/02/05 12:34:08 kls Exp $
  */
 
 #include "recording.h"
@@ -604,6 +604,7 @@ char *cRecording::SortName(void) const
 {
   if (!sortBuffer) {
      char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
+     strreplace(s, '/', 'a'); // some locales ignore '/' when sorting
      int l = strxfrm(NULL, s, 0) + 1;
      sortBuffer = MALLOC(char, l);
      strxfrm(sortBuffer, s, l);
-- 
cgit v1.2.3