Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add Json.Net and separate out Statistics Configuration file

Browse Source 
Import Json.Net since it's difficult for SimpleJson to deal with nested type.
This commit is contained in:
icylogic
2015-09-03 14:08:35 +08:00
parent a30cb166a5
commit 4e1b140dd9
10 changed files with 132 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs
+6 -2
View File
@@ -9,7 +9,7 @@ namespace Shadowsocks.View
{
public partial class StatisticsStrategyConfigurationForm: Form
{
private ShadowsocksController _controller;
private readonly ShadowsocksController _controller;
private StatisticsStrategyConfiguration _configuration;
public StatisticsStrategyConfigurationForm(ShadowsocksController controller)
@@ -24,8 +24,12 @@ namespace Shadowsocks.View
private void LoadConfiguration()
{
_configuration = _controller.GetConfigurationCopy()?.statisticsStrategyConfiguration
_configuration = _controller.StatisticsConfiguration
?? new StatisticsStrategyConfiguration();
if (_configuration.Calculations == null)
{
_configuration = new StatisticsStrategyConfiguration();
}
}
private void InitData()