Fixed a superfluous call to the skin's SetRecording() function after renaming a recording

3 files changed, 7 insertions, 7 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c1099978..2fec0012 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2394,6 +2394,8 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for reporting that the source recording was not deleted after moving it to a different
  volume
  for suggesting to replace "Schnitt" with "Bearbeitung" in the German OSD texts
+ for reporting a superfluous call to the skin's SetRecording() function after renaming
+ a recording
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
diff --git a/HISTORY b/HISTORY
index be5de53f..56a3ee2d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8167,3 +8167,5 @@ Video Disk Recorder Revision History
   This may, for instance, be useful for plugins that implement live streaming, so that
   they can react on changes to a channel's PIDs or CA descriptors (problem reported
   by Mariusz Bialonczyk).
+- Fixed a superfluous call to the skin's SetRecording() function after renaming a
+  recording (reported by Christoph Haubrich).
diff --git a/menu.c b/menu.c
index 6c7acfcb..1001d29e 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 3.15 2013/12/27 09:00:24 kls Exp $
+ * $Id: menu.c 3.16 2014/01/25 12:40:28 kls Exp $
  */
 
 #include "menu.h"
@@ -2473,12 +2473,8 @@ void cMenuRecording::Display(void)
 
 eOSState cMenuRecording::ProcessKey(eKeys Key)
 {
-  if (HasSubMenu()) {
-     eOSState state = cOsdMenu::ProcessKey(Key);
-     if (state == osUser1)
-        CloseSubMenu();
-     return state;
-     }
+  if (HasSubMenu())
+     return cOsdMenu::ProcessKey(Key);
   else if (!RefreshRecording())
      return osBack; // the recording has vanished, so close this menu
   switch (int(Key)) {