From 027ec5a63f315596253ac77bfc81929d0de26903 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Tue, 12 Feb 2013 13:16:15 +0100
Subject: [PATCH] Fixed selecting the last replayed recording in the Recordings
 menu

---
 CONTRIBUTORS | 3 +++
 HISTORY      | 3 +++
 menu.c       | 6 ++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d77bdab0..4692c749 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2248,6 +2248,9 @@ Andr
  1.7.32 no longer generates a mark at that point
  for suggesting to automatically go into Pause mode if an editing mark is set during
  replay
+ fpr reporting a bug in 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
 
 Jürgen Schilling <juergen_schilling@web.de>
  for reporting that color buttons were displayed in the recording info menu if it
diff --git a/HISTORY b/HISTORY
index a684f509..7b6d6101 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7600,3 +7600,6 @@ Video Disk Recorder Revision History
 - Updated the Italian OSD texts (thanks to Diego Pierotto).
 - Fixed using "Pause" and "Slow motion" near the end of a recording (replay stopped
   a few seconds after the end of the recording file has been reached).
+- 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 (reported by Andre Weidemann).
diff --git a/menu.c b/menu.c
index 9288198d..25ffb2cc 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.77 2013/02/11 11:08:54 kls Exp $
+ * $Id: menu.c 2.78 2013/02/12 13:10:53 kls Exp $
  */
 
 #include "menu.h"
@@ -2306,8 +2306,10 @@ void cMenuRecordings::Set(bool Refresh)
             if (CurrentRecording && strcmp(CurrentRecording, recording->FileName()) == 0)
                SetCurrent(LastItem);
             }
-         if (LastDir)
+         if (LastDir) {
             LastDir->IncrementCounter(recording->IsNew());
+            LastItem = LastDir;
+            }
          }
       }
   if (Refresh)