sigonasr2/SMX_PGE
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add an error check for invalid JSON when importing a configuration.

Browse Source
This commit is contained in:
Glenn Maynard 2019-10-14 01:09:34 -05:00
parent 219f407246
commit f7453a1600
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
smx-config/Helpers.cs
View File

@ -918,7 +918,13 @@ namespace smx_config
// Import a saved JSON configuration to an SMXConfig.
public static void ImportSettingsFromJSON(string json, ref SMX.SMXConfig config)
{
Dictionary<string, Object> dict = SMXJSON.ParseJSON.Parse<Dictionary<string, Object>>(json);
Dictionary<string, Object> dict;
try {
dict = SMXJSON.ParseJSON.Parse<Dictionary<string, Object>>(json);
} catch(ParseError e) {
MessageBox.Show(e.Message, "Error importing configuration", MessageBoxButton.OK, MessageBoxImage.Warning);
return;
}
// Read the thresholds. If any values are missing, we'll leave the value in config alone.
if(config.fsr())

3
smx-config/SMXJSON.cs
View File

@ -9,7 +9,8 @@ namespace SMXJSON
{
public class JSONError: Exception
{
public JSONError(string error)
public JSONError(string error):
base(error)
{
}
};