From 371b9be00bf3a6e301e9709bb9afd4294ea7a1dc Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 12 Oct 2002 09:13:05 +0200
Subject: [PATCH] Fixed switching the video format in the Setup/DVB menu

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

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d1412346..a24ade4c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -189,6 +189,7 @@ Wolfgang Henselmann-Weiss <Wolfgang_Henselmann@betaresearch.de>
 Uwe Scheffler <linux_dvb@uni.de>
  for his help in keeping 'channels.conf.cable' and 'channels.conf.terr' up to date
  for helping to test new DVB-T handling
+ for reporting a bug in switching the video format in the Setup/DVB menu
 
 Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  for improving AC3 decoding when replaying DVDs
diff --git a/HISTORY b/HISTORY
index 2bde6c5d..55af3875 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1594,3 +1594,5 @@ Video Disk Recorder Revision History
   VDR with NEWSTRUCT=1.
 - Fixed radio channels in channels.conf.cable (thanks to Robert Schiele and Uwe
   Scheffler).
+- Fixed switching the video format in the Setup/DVB menu (thanks to Uwe Scheffler
+  for reporting this one).
diff --git a/menu.c b/menu.c
index fcd9ba43..8c6875d9 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.212 2002/10/06 14:08:44 kls Exp $
+ * $Id: menu.c 1.213 2002/10/12 09:06:57 kls Exp $
  */
 
 #include "menu.h"
@@ -1776,13 +1776,14 @@ cMenuSetupDVB::cMenuSetupDVB(void)
 eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
 {
   int oldPrimaryDVB = Setup.PrimaryDVB;
+  bool oldVideoFormat = Setup.VideoFormat;
   eOSState state = cMenuSetupBase::ProcessKey(Key);
 
   if (state == osBack && Key == kOk) {
-     if (Setup.PrimaryDVB != oldPrimaryDVB) {
+     if (Setup.PrimaryDVB != oldPrimaryDVB)
         state = osSwitchDvb;
+     if (Setup.VideoFormat != oldVideoFormat)
         cDevice::PrimaryDevice()->SetVideoFormat(Setup.VideoFormat);
-        }
      }
   return state;
 }