Merge branch 'dev' into systray

systray
MCARDLE Sean M 2016-11-18 19:54:14 -08:00
commit a43ef8040f
2 changed files with 8 additions and 5 deletions

View File

@ -32,7 +32,8 @@ namespace WifiSitter
this.Nics = QueryNetworkAdapters(NicWhitelist);
// Loop through nics and add id:state to _originalNicState list
Nics.ForEach(x => _originalNicState.Add(new string[] { x.Id, x.IsEnabled.ToString() }));
Nics.Where(x => !NicWhitelist.Any(y => x.Description.StartsWith(y))).ToList()
.ForEach(x => _originalNicState.Add(new string[] { x.Id, x.IsEnabled.ToString() }));
_ignoreAdapters = NicWhitelist;

View File

@ -348,17 +348,19 @@ namespace WifiSitter
var taskList = new List<Task>();
foreach (var n in netstate.OriginalNicState) {
var id = n[0];
var stat = n[1];
var id = n[0];
var state = n[1];
TrackedNic now = netstate.Nics.Where(x => x.Id == id).FirstOrDefault();
if (now != null) {
if (stat.ToLower() != now.IsEnabled.ToString().ToLower()) {
if (stat == true.ToString()) {
if (state.ToLower() != now.IsEnabled.ToString().ToLower()) {
if (state == true.ToString()) {
WriteLog(LogType.info, "Restoring adapter state, enabling adapter: {0} - {1}", now.Name, now.Description);
var enableTask = new Task(() => { now.Enable(); });
enableTask.Start();
taskList.Add(enableTask);
}
else {
WriteLog(LogType.info, "Restoring adapter state, disabling adapter: {0} - {1}", now.Name, now.Description);
var disableTask = new Task(() => { now.Disable(); });
disableTask.Start();
taskList.Add(disableTask); }