From 89ecc6b4527740bb4307602dc5fb5416d5c40cfc Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 11 Jan 2004 21:42:23 +0100
Subject: Fixed resetting the EPG data versions after changing the preferred
 languages

---
 menu.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'menu.c')

diff --git a/menu.c b/menu.c
index cf9d8eb1..a2a408d3 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.279 2004/01/11 15:40:32 kls Exp $
+ * $Id: menu.c 1.280 2004/01/11 21:37:17 kls Exp $
  */
 
 #include "menu.h"
@@ -2068,10 +2068,6 @@ void cMenuSetupEPG::Setup(void)
 
 eOSState cMenuSetupEPG::ProcessKey(eKeys Key)
 {
-  int oldnumLanguages = numLanguages;
-  int oldSetSystemTime = data.SetSystemTime;
-
-  eOSState state = cMenuSetupBase::ProcessKey(Key);
   if (Key == kOk) {
      bool Modified = numLanguages != originalNumLanguages;
      if (!Modified) {
@@ -2085,7 +2081,12 @@ eOSState cMenuSetupEPG::ProcessKey(eKeys Key)
      if (Modified)
         cSchedules::ResetVersions();
      }
-  else if (Key != kNone) {
+
+  int oldnumLanguages = numLanguages;
+  int oldSetSystemTime = data.SetSystemTime;
+
+  eOSState state = cMenuSetupBase::ProcessKey(Key);
+  if (Key != kNone) {
      if (numLanguages != oldnumLanguages || data.SetSystemTime != oldSetSystemTime) {
         for (int i = oldnumLanguages; i < numLanguages; i++) {
             data.EPGLanguages[i] = 0;
-- 
cgit v1.2.3