blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manager: always start the variable lookup table with a fresh map

Browse Source 
If the loaded config doesn't define the default variables, the latter
should not be found in the lookup table any more; this is now fixed.
This commit is contained in:
Sybren A. Stüvel 2022-08-29 17:44:47 +02:00
parent 4a201d47b4
commit 20395e0e26
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/manager/config/config.go
View File

@ -311,9 +311,10 @@ func (c *Conf) ensureVariablesUnique() {
} }
func (c *Conf) constructVariableLookupTable() { func (c *Conf) constructVariableLookupTable() {
if c.VariablesLookup == nil { // Always start with a fresh map, so that variables (or values) that have been
c.VariablesLookup = map[VariableAudience]map[VariablePlatform]map[string]string{} // removed are actually gone. This is even necessary to account for
} // differences between the default config and the loaded config.
c.VariablesLookup = map[VariableAudience]map[VariablePlatform]map[string]string{}
c.constructVariableLookupTableForVars(c.Variables) c.constructVariableLookupTableForVars(c.Variables)
c.constructVariableLookupTableForVars(c.implicitVariables) c.constructVariableLookupTableForVars(c.implicitVariables)