hipstercat
/
GiantsTools
mirror of https://github.com/ncblakely/GiantsTools
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6 from ncblakely/users/tos/fixconfig 

Fix config defaulting logic.
This commit is contained in:
ncblakely 2022-09-05 14:41:11 -07:00 committed by GitHub
parent d5eff87ae2 77719159d0
commit 470d21ec09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Giants.Launcher/Config.cs
View File

@ -39,13 +39,22 @@
if (this.userConfig.ContainsKey(section))
{
dynamic sectionObject = this.userConfig[section];
if (sectionObject != null)
if (sectionObject != null && sectionObject.ContainsKey(key))
{
return sectionObject.ContainsKey(key) ? (string)sectionObject[key] : "";
return (string)sectionObject[key];
}
}
return this.defaultConfig[section][key];
if (this.defaultConfig.ContainsKey(section))
{
dynamic sectionObject = this.defaultConfig[section];
if (sectionObject != null && sectionObject.ContainsKey(key))
{
return (string)sectionObject[key];
}
}
return string.Empty;
}
// TODO: other accessors unimplemented as we only need master server host name for now