projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e36017b
)
fixed bug with re-initialized variables when reading multiple config files
author
Holger Schemel
<holger.schemel@virtion.de>
Sun, 3 Sep 2023 20:57:17 +0000
(22:57 +0200)
committer
Holger Schemel
<holger.schemel@virtion.de>
Sun, 3 Sep 2023 20:58:11 +0000
(22:58 +0200)
src/files.c
patch
|
blob
|
history
diff --git
a/src/files.c
b/src/files.c
index 69ef8a5212e45a0028f62a21ea57a55b2b1e861c..58d3e1b77ef4619415c98f96cfffc3b66d667dd0 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-12725,13
+12725,12
@@
static void LoadMenuDesignSettingsFromFilename(char *filename)
}
}
}
}
- // special case: check if network and preview player positions are redefined
- InitMenuDesignSettings_PreviewPlayers();
- InitMenuDesignSettings_PreviewPlayers_FromHash(setup_file_hash);
-
// read (and overwrite with) values that may be specified in config file
InitMenuDesignSettings_FromHash(setup_file_hash, TRUE);
// read (and overwrite with) values that may be specified in config file
InitMenuDesignSettings_FromHash(setup_file_hash, TRUE);
+ // special case: check if network and preview player positions are redefined
+ InitMenuDesignSettings_PreviewPlayers_FromHash(setup_file_hash);
+
freeSetupFileHash(setup_file_hash);
}
freeSetupFileHash(setup_file_hash);
}
@@
-12741,6
+12740,7
@@
void LoadMenuDesignSettings(void)
InitMenuDesignSettings_Static();
InitMenuDesignSettings_SpecialPreProcessing();
InitMenuDesignSettings_Static();
InitMenuDesignSettings_SpecialPreProcessing();
+ InitMenuDesignSettings_PreviewPlayers();
if (!GFX_OVERRIDE_ARTWORK(ARTWORK_TYPE_GRAPHICS))
{
if (!GFX_OVERRIDE_ARTWORK(ARTWORK_TYPE_GRAPHICS))
{