From d8264ee1b2c6331bbf5979e6e8dff1e2c00d95bf Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Mon, 30 Apr 2007 09:53:34 +0200
Subject: [PATCH] Fixed handling ChannelUp/Down keys if there is currently a
 replay running

---
 CONTRIBUTORS | 1 +
 HISTORY      | 6 +++++-
 vdr.c        | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a232f790..b2aaa52e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1396,6 +1396,7 @@ Marco Schl
  speed mode"
  for removing 'assert(0)' from cDvbSpuDecoder::setTime()
  for adapting 'libsi' to DVB-S2
+ for fixing handling ChannelUp/Down keys if there is currently a replay running
 
 Jürgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
diff --git a/HISTORY b/HISTORY
index f6b21d36..fb3ed56d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5166,11 +5166,13 @@ Video Disk Recorder Revision History
   wrongly encoded, but apparently on the new transponder they started broadcasting
   on this month, they got it right.
 
-2007-04-28: Version 1.4.6-1
+2007-04-30: Version 1.4.6-1
 
 - Fixed a busy loop in fast forward if the next video data file is missing
   (thanks to Reinhard Nissl).
 - Fixed handling frequencies in NitFilter::Process() (thanks to Anssi Hannula).
+- Fixed handling ChannelUp/Down keys if there is currently a replay running
+  (thanks to Marco Schlüßler).
 
 2007-04-30: Version 1.5.3
 
@@ -5182,3 +5184,5 @@ Video Disk Recorder Revision History
   Richter).
 - Non-primary devices in Transfer mode are now also used for recording (thanks
   to Anssi Hannula).
+- Fixed handling ChannelUp/Down keys if there is currently a replay running
+  (thanks to Marco Schlüßler).
diff --git a/vdr.c b/vdr.c
index c01588fa..a76809cd 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.288 2007/04/30 09:22:27 kls Exp $
+ * $Id: vdr.c 1.289 2007/04/30 09:52:51 kls Exp $
  */
 
 #include <getopt.h>
@@ -952,7 +952,7 @@ int main(int argc, char *argv[])
           case kChanDn:
                if (!Interact)
                   Menu = new cDisplayChannel(NORMALKEY(key));
-               else if (cDisplayChannel::IsOpen()) {
+               else if (cDisplayChannel::IsOpen() || cControl::Control()) {
                   Interact->ProcessKey(key);
                   continue;
                   }