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

Author: sergiye

OpenHardwareMonitor/UI/MainForm.Designer.cs

@@ -50,6 +50,7 @@ public sealed partial class MainForm : Form
     private int _delayCount;
     private bool _selectionDragging;
     private DateTime _nextUpdateCheckTime;
+    private DateTime _nextAutoResetTime;
 
     public MainForm()
     {
@@ -151,7 +152,6 @@ public MainForm()
         _computer.HardwareRemoved += HardwareRemoved;
         _computer.Open(_settings.IsPortable);
 
-        backgroundUpdater.DoWork += BackgroundUpdater_DoWork;
         timer.Enabled = true;
 
         UserOption showHiddenSensors = new("hiddenMenuItem", false, hiddenMenuItem, _settings);
@@ -438,7 +438,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)
@@ -457,24 +457,11 @@ public bool AuthWebServerMenuItemChecked
 
     public HttpServer Server { get; }
 
-    private void BackgroundUpdater_DoWork(object sender, DoWorkEventArgs e)
-    {
-        _computer.Accept(_updateVisitor);
-
-        if (_logSensors != null && _logSensors.Value && _delayCount >= 4)
-            _logger.Log();
-
-        if (_delayCount < 4)
-            _delayCount++;
-    }
-
     private void PowerModeChanged(object sender, Microsoft.Win32.PowerModeChangedEventArgs eventArgs)
     {
-        if (eventArgs.Mode == Microsoft.Win32.PowerModes.Resume && _computer.IsBatteryEnabled)
+        if (eventArgs.Mode == Microsoft.Win32.PowerModes.Resume || _computer.IsBatteryEnabled)
         {
-            _computer.IsBatteryEnabled = false;
-            _computer.IsBatteryEnabled = true;
-            //_computer.Reset();
+            _nextAutoResetTime = DateTime.Now.AddSeconds(3);
         }
     }
 
@@ -556,13 +543,22 @@ private void NodeTextBoxText_EditorShowing(object sender, CancelEventArgs e)
 
     private void Timer_Tick(object sender, EventArgs e)
     {
+        if (_nextAutoResetTime != DateTime.MinValue && _nextAutoResetTime < DateTime.Now)
+        {
+            _nextAutoResetTime = DateTime.MinValue;
+            _computer.Reset();
+        }
+
         treeView.Invalidate();
         _systemTray.Redraw();
         _gadget?.Redraw();
         _wmiProvider?.Update();
 
-        if (!backgroundUpdater.IsBusy)
-            backgroundUpdater.RunWorkerAsync();
+        _computer.Accept(_updateVisitor);
+        if (_logSensors != null && _logSensors.Value && _delayCount >= 4)
+            _logger.Log();
+        if (_delayCount < 4)
+            _delayCount++;
 
         RestoreCollapsedNodeState(treeView);
 
@@ -642,7 +638,6 @@ private void CloseApplication(object sender, EventArgs e)
 
         Visible = false;
 
-        backgroundUpdater?.Dispose();
         timer.Enabled = false;
         timer?.Dispose();
 

OpenHardwareMonitor/UI/MainForm.cs

@@ -8,9 +8,9 @@
 
 namespace OpenHardwareMonitor.Hardware.Battery;
 
-internal class BatteryGroup : IGroup, IHardwareChanged
+internal class BatteryGroup : IGroup
 {
-    private readonly List<Battery> _hardware = [];
+    private readonly List<Battery> _hardware = new();
 
     static bool QueryStringFromBatteryInfo(SafeFileHandle battery, Kernel32.BATTERY_QUERY_INFORMATION bqi, out string value)
     {
@@ -41,9 +41,6 @@ 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
@@ -139,7 +136,6 @@ public unsafe BatteryGroup(ISettings settings)
 
             SetupApi.SetupDiDestroyDeviceInfoList(hdev);
         }
-        _hardware.ForEach(h => HardwareAdded?.Invoke(h));
     }
 
     /// <inheritdoc />
@@ -148,7 +144,6 @@ public unsafe BatteryGroup(ISettings settings)
     /// <inheritdoc />
     public void Close()
     {
-        _hardware.ForEach(h => HardwareRemoved?.Invoke(h));
         foreach (Battery battery in _hardware)
             battery.Close();
     }