diff --git a/WifiSitter/Model/NetworkState.cs b/WifiSitter/Model/NetworkState.cs index 08d47f3..53ac9c3 100644 --- a/WifiSitter/Model/NetworkState.cs +++ b/WifiSitter/Model/NetworkState.cs @@ -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; diff --git a/WifiSitter/WifiSitter.cs b/WifiSitter/WifiSitter.cs index e2747d7..36f5761 100644 --- a/WifiSitter/WifiSitter.cs +++ b/WifiSitter/WifiSitter.cs @@ -348,17 +348,19 @@ namespace WifiSitter var taskList = new List(); 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); }