From d42c22382640040442b2298af782cef8107d848a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 6 Jun 2004 09:48:17 +0200
Subject: [PATCH] Fixed displaying the current channel when switching via the
 SVDRP command CHAN

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

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0c3b3b11..e649d34d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1016,3 +1016,7 @@ Wayne Keer <syphir@syphir.sytes.net>
 Marco Schlüßler <marco@lordzodiac.de>
  for fixing handling colors in cDvbSpuPalette::yuv2rgb()
  for fixing setting lnb voltage if the frontend is not DVB-S
+
+Jürgen Schmitz <j.schmitz@web.de>
+ for reporting a bug in displaying the current channel when switching via the SVDRP
+ command CHAN
diff --git a/HISTORY b/HISTORY
index 7b66dc58..e103c71b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2870,7 +2870,7 @@ Video Disk Recorder Revision History
   available by compiling VDR with DEBUG_OSD. Some things may not yet work as they
   should, but it's a starting point.
 
-2004-06-05: Version 1.3.10
+2004-06-06: Version 1.3.10
 
 - Fixed some default parameters in 'skincurses'.
 - Fixed cBitmap::DrawPixel(), which messed with other bitmaps' palettes in case
@@ -2883,3 +2883,5 @@ Video Disk Recorder Revision History
   some broken graphics tools write into XPM files (suggested by Sascha Volkenandt).
 - No longer setting lnb voltage if the frontend is not DVB-S (thanks to Marco
   Schlüßler).
+- Fixed displaying the current channel when switching via the SVDRP command CHAN
+  (thanks to Jürgen Schmitz for reporting this one).
diff --git a/menu.c b/menu.c
index 49cdef4c..3fd39b15 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 1.307 2004/05/29 10:19:22 kls Exp $
+ * $Id: menu.c 1.308 2004/06/06 09:47:44 kls Exp $
  */
 
 #include "menu.h"
@@ -2643,6 +2643,8 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
                      }
     };
   if (time_ms() - lastTime < INFOTIMEOUT) {
+     if (!number && group < 0 && channel && channel->Number() != cDevice::CurrentChannel())
+        Refresh(); // makes sure a channel switch through the SVDRP CHAN command is displayed
      DisplayInfo();
      displayChannel->Flush();
      return osContinue;