From f4aabad2ae12598eb8baa3e3a674f729dd0ae481 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 15 Jul 2012 10:52:16 +0200
Subject: [PATCH] Fixed sorting recordings in the top level video directory

---
 HISTORY     |  4 ++++
 config.h    | 10 +++++-----
 recording.c |  6 +++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/HISTORY b/HISTORY
index f7ca2aaa..3b272931 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7190,3 +7190,7 @@ Video Disk Recorder Revision History
 - The new setup option "Miscellaneous/Show channel names with source" can be used to
   turn on adding the source character to channel names whenever they are displayed
   (suggested by Ludi Kaleni).
+
+2012-07-15: Version 1.7.30
+
+- Fixed sorting recordings in the top level video directory.
diff --git a/config.h b/config.h
index acdf77a7..b4428215 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.49 2012/06/17 11:14:50 kls Exp $
+ * $Id: config.h 2.50 2012/07/15 10:51:56 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.29"
-#define VDRVERSNUM   10729  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.30"
+#define VDRVERSNUM   10730  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.29"
-#define APIVERSNUM   10729  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.30"
+#define APIVERSNUM   10730  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/recording.c b/recording.c
index d13225be..ad546f5f 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 2.57 2012/06/09 13:57:30 kls Exp $
+ * $Id: recording.c 2.58 2012/07/15 10:47:58 kls Exp $
  */
 
 #include "recording.h"
@@ -831,8 +831,8 @@ char *cRecording::SortName(void) const
 {
   char **sb = (RecordingsSortMode == rsmName) ? &sortBufferName : &sortBufferTime;
   if (!*sb) {
-     char *s = (RecordingsSortMode == rsmName) ? strdup(FileName() + strlen(VideoDirectory) + 1)
-                                              : StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
+     char *s = (RecordingsSortMode == rsmName) ? strdup(FileName() + strlen(VideoDirectory))
+                                              : StripEpisodeName(strdup(FileName() + strlen(VideoDirectory)));
      strreplace(s, '/', 'a'); // some locales ignore '/' when sorting
      int l = strxfrm(NULL, s, 0) + 1;
      *sb = MALLOC(char, l);