Always set the current file version at end of config. Don't update config

when checking for file version.


SVN revision: 27698
This commit is contained in:
Sebastian Dransfeld 2006-12-31 13:01:34 +00:00
parent 758f25ac2c
commit 8f5b4dfbf8
1 changed files with 4 additions and 3 deletions

View File

@ -548,8 +548,7 @@ e_config_init(void)
e_config->config_version = (E_CONFIG_FILE_EPOCH << 16); e_config->config_version = (E_CONFIG_FILE_EPOCH << 16);
} }
#define IFCFG(v) \ #define IFCFG(v) \
if ((e_config->config_version & 0xffff) < (v)) { \ if ((e_config->config_version & 0xffff) < (v)) {
e_config->config_version = (e_config->config_version & 0xffff0000) | (v)
#define IFCFGEND } #define IFCFGEND }
IFCFG(0x008d); IFCFG(0x008d);
e_config->show_splash = 1; e_config->show_splash = 1;
@ -1293,7 +1292,9 @@ e_config_init(void)
800 - 32, NULL, 0, 0); 800 - 32, NULL, 0, 0);
} }
IFCFGEND; IFCFGEND;
e_config->config_version = E_CONFIG_FILE_VERSION;
#if 0 /* example of new config */ #if 0 /* example of new config */
IFCFG(0x0090); /* the version # where this value(s) was introduced */ IFCFG(0x0090); /* the version # where this value(s) was introduced */
e_config->new_value = 10; /* set the value(s) */ e_config->new_value = 10; /* set the value(s) */