Merge branch 'dev' into systray
commit
a43ef8040f
|
@ -32,7 +32,8 @@ namespace WifiSitter
|
||||||
this.Nics = QueryNetworkAdapters(NicWhitelist);
|
this.Nics = QueryNetworkAdapters(NicWhitelist);
|
||||||
|
|
||||||
// Loop through nics and add id:state to _originalNicState list
|
// 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;
|
_ignoreAdapters = NicWhitelist;
|
||||||
|
|
||||||
|
|
|
@ -348,17 +348,19 @@ namespace WifiSitter
|
||||||
|
|
||||||
var taskList = new List<Task>();
|
var taskList = new List<Task>();
|
||||||
foreach (var n in netstate.OriginalNicState) {
|
foreach (var n in netstate.OriginalNicState) {
|
||||||
var id = n[0];
|
var id = n[0];
|
||||||
var stat = n[1];
|
var state = n[1];
|
||||||
TrackedNic now = netstate.Nics.Where(x => x.Id == id).FirstOrDefault();
|
TrackedNic now = netstate.Nics.Where(x => x.Id == id).FirstOrDefault();
|
||||||
if (now != null) {
|
if (now != null) {
|
||||||
if (stat.ToLower() != now.IsEnabled.ToString().ToLower()) {
|
if (state.ToLower() != now.IsEnabled.ToString().ToLower()) {
|
||||||
if (stat == true.ToString()) {
|
if (state == true.ToString()) {
|
||||||
|
WriteLog(LogType.info, "Restoring adapter state, enabling adapter: {0} - {1}", now.Name, now.Description);
|
||||||
var enableTask = new Task(() => { now.Enable(); });
|
var enableTask = new Task(() => { now.Enable(); });
|
||||||
enableTask.Start();
|
enableTask.Start();
|
||||||
taskList.Add(enableTask);
|
taskList.Add(enableTask);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
WriteLog(LogType.info, "Restoring adapter state, disabling adapter: {0} - {1}", now.Name, now.Description);
|
||||||
var disableTask = new Task(() => { now.Disable(); });
|
var disableTask = new Task(() => { now.Disable(); });
|
||||||
disableTask.Start();
|
disableTask.Start();
|
||||||
taskList.Add(disableTask); }
|
taskList.Add(disableTask); }
|
||||||
|
|
Loading…
Reference in New Issue