frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed resetting the EPG data versions after changing the preferred languages

Browse Source
This commit is contained in:
Klaus Schmidinger 2004-01-11 21:42:23 +01:00
parent 7f9d14ee8b
commit 89ecc6b452
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -641,6 +641,8 @@ Teemu Rantanen <tvr@iki.fi>
for reporting a problem in calculation of channel ids for tv stations that use for reporting a problem in calculation of channel ids for tv stations that use
the undefined NID value 0 the undefined NID value 0
for adding EPG preferred languages 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> Jan Ekholm <chakie@infa.abo.fi>
for adding/improving some Swedish language OSD texts for adding/improving some Swedish language OSD texts

5
HISTORY
View File

@ -2571,3 +2571,8 @@ Video Disk Recorder Revision History
scanned for channels during the next EPG scan. Note that only the satellite 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 branches are tested, cable and terrestrial need to be tested by somebody who
actually has such equipment. 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).

6
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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 #ifndef __CONFIG_H
@ -20,8 +20,8 @@
#include "i18n.h" #include "i18n.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.3.1" #define VDRVERSION "1.3.2"
#define VDRVERSNUM 10301 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10302 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99 #define MAXPRIORITY 99
#define MAXLIFETIME 99 #define MAXLIFETIME 99

13
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "menu.h"
@ -2068,10 +2068,6 @@ void cMenuSetupEPG::Setup(void)
eOSState cMenuSetupEPG::ProcessKey(eKeys Key) eOSState cMenuSetupEPG::ProcessKey(eKeys Key)
{ {
int oldnumLanguages = numLanguages;
int oldSetSystemTime = data.SetSystemTime;
eOSState state = cMenuSetupBase::ProcessKey(Key);
if (Key == kOk) { if (Key == kOk) {
bool Modified = numLanguages != originalNumLanguages; bool Modified = numLanguages != originalNumLanguages;
if (!Modified) { if (!Modified) {
@ -2085,7 +2081,12 @@ eOSState cMenuSetupEPG::ProcessKey(eKeys Key)
if (Modified) if (Modified)
cSchedules::ResetVersions(); 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) { if (numLanguages != oldnumLanguages || data.SetSystemTime != oldSetSystemTime) {
for (int i = oldnumLanguages; i < numLanguages; i++) { for (int i = oldnumLanguages; i < numLanguages; i++) {
data.EPGLanguages[i] = 0; data.EPGLanguages[i] = 0;