From 219ccb51a7897004d8e42d03950f4a343e0d6864 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 10 Feb 2002 11:58:17 +0100
Subject: If Setup.ShowInfoOnChSwitch is set to 'no', the box for the EPG
 display is no longer shown

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

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0d08f10b..07925b51 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -162,6 +162,7 @@ Simon Bauschulte <SemiSchwabe@Brutzel.de>
 
 Andy Grobb <Charly98@01019freenet.de>
  for completing storing the current audio volume in the setup.conf file
+ for fixing the EPG display in case Setup.ShowInfoOnChSwitch is set to "no"
 
 Thomas Heiligenmann <thomas@heiligenmann.de>
  for implementing the SVDRP commands LSTR and DELR
diff --git a/HISTORY b/HISTORY
index fe269c8d..aabe491f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -987,3 +987,5 @@ Video Disk Recorder Revision History
   automatically closed (suggested by Uwe Freese).
 - Changed the default name for instant recordings to "TITLE EPISODE" (avoiding
   the '-').
+- If Setup.ShowInfoOnChSwitch is set to "no", the box for the EPG display is no
+  longer shown (thanks to Andy Grobb).
diff --git a/menu.c b/menu.c
index 2e787274..a7a98ec3 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.151 2002/02/10 11:25:07 kls Exp $
+ * $Id: menu.c 1.152 2002/02/10 11:52:34 kls Exp $
  */
 
 #include "menu.h"
@@ -2124,10 +2124,11 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
 {
   group = -1;
   withInfo = !Switched || Setup.ShowInfoOnChSwitch;
+  int EpgLines = withInfo ? 5 : 1;
   lines = 0;
   oldNumber = number = 0;
   cChannel *channel = Channels.GetByNumber(Number);
-  Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? 5 : -5);
+  Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? EpgLines : -EpgLines);
   if (channel) {
      DisplayChannel(channel);
      DisplayInfo();
@@ -2142,7 +2143,8 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
   oldNumber = cDvbApi::CurrentChannel();
   number = 0;
   lastTime = time_ms();
-  Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? 5 : -5);
+  int EpgLines = Setup.ShowInfoOnChSwitch ? 5 : 1;
+  Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? EpgLines : -EpgLines);
   ProcessKey(FirstKey);
 }
 
-- 
cgit v1.2.3