Unified the internal sequence of actions when pressing the Blue and the Back key, respectively, during replay

4 files changed, 15 insertions, 8 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b749d083..7dfef151 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3163,3 +3163,7 @@ Dominique Dumont <domi.dumont@free.fr>
 Manfred Völkel <mvoelkel@digitaldevices.de>
  for suggesting to make all bonded devices (except for the master) turn off their LNB
  power completely to avoid problems when receiving vertically polarized transponders
+
+Thomas Maass <mase@setho.org>
+ for reporting a difference in the internal sequence of actions when pressing the Blue
+ and the Back key, respectively, during replay
diff --git a/HISTORY b/HISTORY
index 05109534..1ec039f6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7831,3 +7831,8 @@ Video Disk Recorder Revision History
   Manfred Völkel and Oliver Endriss).
 - Fixed cleaning up old EPG events in case no epg data file is given (reported by
   Dave Pickles).
+
+2013-09-07: Version 2.0.4
+
+- Unified the internal sequence of actions when pressing the Blue and the Back key,
+  respectively, during replay (reported by Thomas Maass).
diff --git a/config.h b/config.h
index f646f792..4c088424 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.76.1.3 2013/08/21 13:44:59 kls Exp $
+ * $Id: config.h 2.76.1.4 2013/09/07 10:25:10 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,8 +22,8 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "2.0.3"
-#define VDRVERSNUM   20003  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.0.4"
+#define VDRVERSNUM   20004  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
diff --git a/menu.c b/menu.c
index f43dec5d..7bccfe8c 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.1.2 2013/04/27 10:32:28 kls Exp $
+ * $Id: menu.c 2.82.1.3 2013/09/07 10:24:48 kls Exp $
  */
 
 #include "menu.h"
@@ -4968,10 +4968,8 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
                            else
                               Show();
                            break;
-            case kBack:    if (Setup.DelTimeshiftRec) {
-                              cRecordControl* rc = cRecordControls::GetRecordControl(fileName);
-                              return rc && rc->InstantId() ? osEnd : osRecordings;
-                              }
+            case kBack:    Hide();
+                           Stop();
                            return osRecordings;
             default:       return osUnknown;
             }