Merge branch 'master' into feature/statistics_ui

This commit is contained in:
icylogic
2015-09-30 21:16:45 +08:00
25 changed files with 888 additions and 306 deletions
@@ -126,7 +126,7 @@ namespace Shadowsocks.Controller
{
_config.configs = servers;
_config.localPort = localPort;
SaveConfig(_config);
Configuration.Save(_config);
}
public void SaveStrategyConfigurations(StatisticsStrategyConfiguration configuration)
@@ -288,6 +288,18 @@ namespace Shadowsocks.Controller
}
}
public void ToggleCheckingUpdate(bool enabled)
{
_config.autoCheckUpdate = enabled;
Configuration.Save(_config);
}
public void SaveLogViewerConfig(LogViewerConfig newConfig)
{
_config.logViewer = newConfig;
Configuration.Save(_config);
}
protected void Reload()
{
// some logic in configuration updated the config when saving, we need to read it again