Fixed resetting the EPG data versions after changing the preferred languages

4 files changed, 17 insertions, 9 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9b21c586..ff8cc6f2 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -641,6 +641,8 @@ Teemu Rantanen <tvr@iki.fi>
  for reporting a problem in calculation of channel ids for tv stations that use
  the undefined NID value 0
  for adding EPG preferred languages
+ for reporting and helping to debug resetting the EPG data versions after changing
+ the preferred languages
 
 Jan Ekholm <chakie@infa.abo.fi>
  for adding/improving some Swedish language OSD texts
diff --git a/HISTORY b/HISTORY
index 6e6cd5a2..e1e633bf 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2571,3 +2571,8 @@ Video Disk Recorder Revision History
   scanned for channels during the next EPG scan. Note that only the satellite
   branches are tested, cable and terrestrial need to be tested by somebody who
   actually has such equipment.
+
+2004-01-11: Version 1.3.2
+
+- Fixed resetting the EPG data versions after changing the preferred languages
+  (thanks to Teemu Rantanen for reporting this one and helping to debug it).
diff --git a/config.h b/config.h
index 22623e73..0a49f3fa 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.182 2004/01/06 16:47:41 kls Exp $
+ * $Id: config.h 1.183 2004/01/11 21:42:23 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.1"
-#define VDRVERSNUM   10301  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.2"
+#define VDRVERSNUM   10302  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
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;