Browse Source

Fix handling of invalid conf file

Fixes GitHub issue #1068
pull/1/head
Grant Limberg 6 years ago
parent
commit
7696d45093
  1. 15
      windows/WinUI/CentralAPI.cs

15
windows/WinUI/CentralAPI.cs

@ -75,7 +75,15 @@ namespace WinUI
{ {
byte[] tmp = File.ReadAllBytes(centralConfigPath); byte[] tmp = File.ReadAllBytes(centralConfigPath);
string json = Encoding.UTF8.GetString(tmp).Trim(); string json = Encoding.UTF8.GetString(tmp).Trim();
Central = JsonConvert.DeserializeObject<CentralServer>(json); CentralServer ctmp = JsonConvert.DeserializeObject<CentralServer>(json);
if (ctmp != null)
{
Central = ctmp;
}
else
{
Central = new CentralServer();
}
} }
else else
{ {
@ -105,7 +113,10 @@ namespace WinUI
{ {
string json = JsonConvert.SerializeObject(Central); string json = JsonConvert.SerializeObject(Central);
byte[] tmp = Encoding.UTF8.GetBytes(json); byte[] tmp = Encoding.UTF8.GetBytes(json);
File.WriteAllBytes(CentralConfigFile(), tmp); if (tmp != null)
{
File.WriteAllBytes(CentralConfigFile(), tmp);
}
} }
private void UpdateRequestHeaders() private void UpdateRequestHeaders()

Loading…
Cancel
Save