"Reset on power changed" menu item removed as not relevant anymore

Author: sergiye

OpenHardwareMonitor/OpenHardwareMonitor.csproj

@@ -56,6 +56,8 @@
   <ItemGroup>
     <PackageReference Include="SergiyE.Common" Version="1.*" />
     <PackageReference Include="SergiyE.Common.UI" Version="1.*" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Configuration)' == 'Release'">
     <PackageReference Include="Costura.Fody" Version="4.1.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

OpenHardwareMonitor/UI/MainForm.Designer.cs

@@ -67,7 +67,6 @@ public MainForm()
         Text = Updater.ApplicationTitle;
         Icon = Icon.ExtractAssociatedIcon(Updater.CurrentFileLocation);
         portableModeMenuItem.Checked = _settings.IsPortable;
-        resetOnPowerChangedMenuItem.Checked = _settings.GetValue("resetOnPowerChangedMenuItem", false);
 
         // make sure the buffers used for double buffering are not disposed
         // after each draw call
@@ -442,7 +441,7 @@ public MainForm()
         FormClosed += CloseApplication;
         // Make sure the settings are saved when the user logs off
         Microsoft.Win32.SystemEvents.SessionEnded += (_, _) => CloseApplication(null, EventArgs.Empty);
-        Microsoft.Win32.SystemEvents.PowerModeChanged += PowerModeChanged;
+        //Microsoft.Win32.SystemEvents.PowerModeChanged += PowerModeChanged;
     }
 
     private void StopFileHardwareMenuFromClosing(object sender, ToolStripDropDownClosingEventArgs e)
@@ -474,18 +473,14 @@ private void BackgroundUpdater_DoWork(object sender, DoWorkEventArgs e)
 
     private void PowerModeChanged(object sender, Microsoft.Win32.PowerModeChangedEventArgs eventArgs)
     {
-        if (eventArgs.Mode == Microsoft.Win32.PowerModes.Resume || resetOnPowerChangedMenuItem.Checked)
+        if (eventArgs.Mode == Microsoft.Win32.PowerModes.Resume && _computer.IsBatteryEnabled)
         {
-            _computer.Reset();
+            _computer.IsBatteryEnabled = false;
+            _computer.IsBatteryEnabled = true;
+            //_computer.Reset();
         }
     }
 
-    private void ResetOnPowerChangedMenuItem_Click(object sender, EventArgs eventArgs)
-    {
-        resetOnPowerChangedMenuItem.Checked = !resetOnPowerChangedMenuItem.Checked;
-        _settings.SetValue("resetOnPowerChangedMenuItem", resetOnPowerChangedMenuItem.Checked);
-    }
-
     private void InitializeTheme()
     {
         mainMenu.Renderer = new ThemedToolStripRenderer();
@@ -535,14 +530,10 @@ private void HardwareAdded(IHardware hardware)
 
     private void HardwareRemoved(IHardware hardware)
     {
-        List<HardwareNode> nodesToRemove = new();
-        foreach (Node node in _root.Nodes)
-        {
-            if (node is HardwareNode hardwareNode && hardwareNode.Hardware == hardware)
-                nodesToRemove.Add(hardwareNode);
-        }
-
-        foreach (HardwareNode hardwareNode in nodesToRemove)
+        var nodesToRemove = _root.Nodes
+            .Where(node => node is HardwareNode hardwareNode && hardwareNode.Hardware == hardware)
+            .ToArray();
+        foreach (var hardwareNode in nodesToRemove)
         {
             _root.Nodes.Remove(hardwareNode);
         }

OpenHardwareMonitor/UI/MainForm.cs

@@ -91,7 +91,13 @@ public void Dispose()
 
     public void Redraw()
     {
-        foreach (SensorNotifyIcon icon in _sensorList)
+        SensorNotifyIcon[] sensorsToRedraw;
+        lock (_sensorList)
+        {
+            sensorsToRedraw = _sensorList.ToArray();
+        }
+
+        foreach (SensorNotifyIcon icon in sensorsToRedraw)
             icon.Update();
     }
 
@@ -120,15 +126,13 @@ private void Remove(ISensor sensor, bool deleteConfig)
             _settings.Remove(new Identifier(sensor.Identifier, "tray").ToString());
             _settings.Remove(new Identifier(sensor.Identifier, "traycolor").ToString());
         }
-        SensorNotifyIcon instance = null;
-        foreach (SensorNotifyIcon icon in _sensorList)
-        {
-            if (icon.Sensor == sensor)
-                instance = icon;
-        }
+        SensorNotifyIcon instance;
+        lock(_sensorList)
+            instance = _sensorList.FirstOrDefault(icon => icon.Sensor == sensor);
         if (instance != null)
         {
-            _sensorList.Remove(instance);
+            lock (_sensorList)
+                _sensorList.Remove(instance);
             UpdateMainIconVisibility();
             instance.Dispose();
         }

OpenHardwareMonitor/UI/SystemTray.cs

@@ -149,7 +149,7 @@ public override void Update()
         Kernel32.BATTERY_WAIT_STATUS bws = default;
         bws.BatteryTag = _batteryTag;
         Kernel32.BATTERY_STATUS batteryStatus = default;
-        if (Kernel32.DeviceIoControl(_batteryHandle,
+        if (!_batteryHandle.IsClosed && Kernel32.DeviceIoControl(_batteryHandle,
                                      Kernel32.IOCTL.IOCTL_BATTERY_QUERY_STATUS,
                                      ref bws,
                                      Marshal.SizeOf(bws),
@@ -213,7 +213,7 @@ public override void Update()
         Kernel32.BATTERY_QUERY_INFORMATION bqi = default;
         bqi.BatteryTag = _batteryTag;
         bqi.InformationLevel = Kernel32.BATTERY_QUERY_INFORMATION_LEVEL.BatteryEstimatedTime;
-        if (Kernel32.DeviceIoControl(_batteryHandle,
+        if (!_batteryHandle.IsClosed && Kernel32.DeviceIoControl(_batteryHandle,
                                      Kernel32.IOCTL.IOCTL_BATTERY_QUERY_INFORMATION,
                                      ref bqi,
                                      Marshal.SizeOf(bqi),
@@ -234,7 +234,7 @@ public override void Update()
 
         uint temperature = 0;
         bqi.InformationLevel = Kernel32.BATTERY_QUERY_INFORMATION_LEVEL.BatteryTemperature;
-        if (Kernel32.DeviceIoControl(_batteryHandle,
+        if (!_batteryHandle.IsClosed && Kernel32.DeviceIoControl(_batteryHandle,
                                      Kernel32.IOCTL.IOCTL_BATTERY_QUERY_INFORMATION,
                                      ref bqi,
                                      Marshal.SizeOf(bqi),
@@ -252,7 +252,7 @@ public override void Update()
 
         bqi.InformationLevel = Kernel32.BATTERY_QUERY_INFORMATION_LEVEL.BatteryInformation;
         Kernel32.BATTERY_INFORMATION bi = default;
-        if (Kernel32.DeviceIoControl(_batteryHandle,
+        if (!_batteryHandle.IsClosed && Kernel32.DeviceIoControl(_batteryHandle,
                                      Kernel32.IOCTL.IOCTL_BATTERY_QUERY_INFORMATION,
                                      ref bqi,
                                      Marshal.SizeOf(bqi),

OpenHardwareMonitorLib/Hardware/Battery/Battery.cs

@@ -8,7 +8,7 @@
 
 namespace OpenHardwareMonitor.Hardware.Battery;
 
-internal class BatteryGroup : IGroup
+internal class BatteryGroup : IGroup, IHardwareChanged
 {
     private readonly List<Battery> _hardware = new();
 
@@ -41,6 +41,9 @@ static bool QueryStringFromBatteryInfo(SafeFileHandle battery, Kernel32.BATTERY_
         return result;
     }
 
+    public event HardwareEventHandler HardwareAdded;
+    public event HardwareEventHandler HardwareRemoved;
+
     public unsafe BatteryGroup(ISettings settings)
     {
         // No implementation for battery information on Unix systems
@@ -136,6 +139,7 @@ public unsafe BatteryGroup(ISettings settings)
 
             SetupApi.SetupDiDestroyDeviceInfoList(hdev);
         }
+        _hardware.ForEach(h => HardwareAdded?.Invoke(h));
     }
 
     /// <inheritdoc />
@@ -144,6 +148,7 @@ public unsafe BatteryGroup(ISettings settings)
     /// <inheritdoc />
     public void Close()
     {
+        _hardware.ForEach(h => HardwareRemoved?.Invoke(h));
         foreach (Battery battery in _hardware)
             battery.Close();
     }

OpenHardwareMonitorLib/Hardware/Battery/BatteryGroup.cs

@@ -20,7 +20,6 @@ internal static class Ring0
     internal static KernelDriver KernelDriver => _driver;
 
     public static void Open(bool portable)
-
     {
         // no implementation for unix systems
         if (OperatingSystemHelper.IsUnix)