- bugfix for merging ini properties (missed a line of code)
This commit is contained in:
parent
5495dcabac
commit
4de585f5b8
|
@ -413,6 +413,7 @@ vector<pair<string,string> > Config::getMergedProperties() const {
|
||||||
pair<string,string> &property = result[j];
|
pair<string,string> &property = result[j];
|
||||||
// Take the user property and override the original value
|
// Take the user property and override the original value
|
||||||
if(property.first == propertyUser.first) {
|
if(property.first == propertyUser.first) {
|
||||||
|
overrideProperty = true;
|
||||||
property.second = propertyUser.second;
|
property.second = propertyUser.second;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user