From fd3bf6c3d2853505f0dddfd11ec408200ffb9e1c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 27 Apr 2013 10:06:49 +0200
Subject: [PATCH] Fixed multiple occurrences of the same directory in the
 recordings list in case there are directories that only differ in
 non-alphanumeric characters

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

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6c00f3a0..f7f3b065 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1013,9 +1013,11 @@ Andreas Mair <amair.sob@googlemail.com>
  for fixing the type of MBperMinute in cVideoDiskUsage::HasChanged()
  for reporting a bug in sorting recordings in case two folders have the same name,
  but one of them ends in an additional digit, as in "abc" and "abc2"
- for reporting multiple occurrences of the same directory in the recordings list ini
+ for reporting multiple occurrences of the same directory in the recordings list in
  case there are directories that only differ in non-alphanumeric characters
  for reporting a problem with reduced number of retries in Transfer Mode on SD-FF cards
+ for fixing multiple occurrences of the same directory in the recordings list in case
+ there are directories that only differ in non-alphanumeric characters
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
diff --git a/HISTORY b/HISTORY
index 06e0b605..3cf91272 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7796,7 +7796,7 @@ Video Disk Recorder Revision History
   improve overall performance when an editing process is running (thanks to Jochen
   Dolze).
 
-2013-04-11: Version 2.1.1
+2013-04-27: Version 2.1.1
 
 - Fixed initializing cDevice::keepTracks.
 - Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than
@@ -7812,3 +7812,8 @@ Video Disk Recorder Revision History
 - Changed the sign of the satellite position value in cSource to reflect the standard
   of western values being negative. The new member function cSource::Position() can be
   used to retrieve the orbital position of a satellite.
+- Fixed multiple occurrences of the same directory in the recordings list in case there
+  are directories that only differ in non-alphanumeric characters (was broken by
+  "Fixed selecting the last replayed recording in the Recordings menu in case there
+  are folders and plain recordings with names that differ only in non-alphanumeric
+  characters" in version 1.7.36).
diff --git a/menu.c b/menu.c
index 31d25d08..8c6d0d21 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.82 2013/03/18 09:11:48 kls Exp $
+ * $Id: menu.c 3.1 2013/04/25 12:51:24 kls Exp $
  */
 
 #include "menu.h"
@@ -2302,14 +2302,12 @@ void cMenuRecordings::Set(bool Refresh)
             }
          else
             delete Item;
-         if (LastItem) {
+         if (LastItem || LastDir) {
             if (CurrentRecording && strcmp(CurrentRecording, recording->FileName()) == 0)
-               SetCurrent(LastItem);
+               SetCurrent(LastDir ? LastDir : LastItem);
             }
-         if (LastDir) {
+         if (LastDir)
             LastDir->IncrementCounter(recording->IsNew());
-            LastItem = LastDir;
-            }
          }
       }
   if (Refresh)