fixed battery hardware duplication on reset

Author: sergiye

OpenHardwareMonitor/Program.cs

@@ -27,7 +27,7 @@ public static void Main()
             Environment.Exit(0);
         }
 
-        if (WinApiHelper.CheckRunningInstances(true, true))
+        if (!System.Diagnostics.Debugger.IsAttached && WinApiHelper.CheckRunningInstances(true, true))
         {
             // fallback
             MessageBox.Show($"{Updater.ApplicationName} is already running.", Updater.ApplicationName,

OpenHardwareMonitor/UI/AboutBox.cs

@@ -15,6 +15,9 @@ public AboutBox()
         lblCopyright.Text = $"Copyright © {Updater.ApplicationName}";
         Font = SystemFonts.MessageBoxFont;
         lblVersion.Text = $"Version {Application.ProductVersion} {(Environment.Is64BitProcess ? "x64" : "x86")}";
+#if DEBUG
+        lblVersion.Text += " (DEBUG)";
+#endif
         //using (var icon = Icon.ExtractAssociatedIcon(Updater.CurrentFileLocation))
         using (var icon = EmbeddedResources.GetIcon("icon.ico"))
             picLogo.Image = icon.GetLargestBitmap();

OpenHardwareMonitor/UI/MainForm.cs

@@ -55,16 +55,19 @@ public MainForm()
     {
         InitializeComponent();
 
-        sensor.WidthChanged += delegate { TreeView_ColumnWidthChanged(this.sensor); };
-        value.WidthChanged += delegate { TreeView_ColumnWidthChanged(this.value); };
-        min.WidthChanged += delegate { TreeView_ColumnWidthChanged(this.min); };
-        max.WidthChanged += delegate { TreeView_ColumnWidthChanged(this.max); };
+        sensor.WidthChanged += delegate { TreeView_ColumnWidthChanged(sensor); };
+        value.WidthChanged += delegate { TreeView_ColumnWidthChanged(value); };
+        min.WidthChanged += delegate { TreeView_ColumnWidthChanged(min); };
+        max.WidthChanged += delegate { TreeView_ColumnWidthChanged(max); };
 
         _settings = new PersistentSettings();
         _settings.Load();
 
         MinimumSize = new Size(400, 200);
         Text = Updater.ApplicationTitle;
+#if DEBUG
+        Text += " (DEBUG)";
+#endif
         Icon = Icon.ExtractAssociatedIcon(Updater.CurrentFileLocation);
         portableModeMenuItem.Checked = _settings.IsPortable;
 
@@ -472,7 +475,10 @@ private void PowerModeChanged(object sender, Microsoft.Win32.PowerModeChangedEve
     {
         if (eventArgs.Mode == Microsoft.Win32.PowerModes.Resume || _computer.IsBatteryEnabled)
         {
-            _computer.Reset();
+            if (InvokeRequired)
+                Invoke(new MethodInvoker(() => ResetClick(sender, eventArgs)));
+            else
+                ResetClick(sender, eventArgs);
         }
     }
 
@@ -890,7 +896,7 @@ protected override void WndProc(ref Message m)
             WindowState = FormWindowState.Normal;
             Activate();
             BringToFront();
-            WinApiHelper.SetForegroundWindow(this.Handle);
+            WinApiHelper.SetForegroundWindow(Handle);
         }
         else
         {

OpenHardwareMonitorLib/Hardware/Battery/Battery.cs

@@ -110,6 +110,8 @@ public Battery
         }
     }
 
+    public uint BatteryTag => _batteryTag;
+
     public float? ChargeDischargeCurrent { get; private set; }
 
     public float? ChargeDischargeRate { get; private set; }

OpenHardwareMonitorLib/Hardware/Battery/BatteryGroup.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using OpenHardwareMonitor.Interop;
@@ -10,9 +11,9 @@ namespace OpenHardwareMonitor.Hardware.Battery;
 
 internal class BatteryGroup : IGroup
 {
-    private readonly List<Battery> _hardware = new();
+    private readonly List<Battery> _hardware = [];
 
-    static bool QueryStringFromBatteryInfo(SafeFileHandle battery, Kernel32.BATTERY_QUERY_INFORMATION bqi, out string value)
+    private static bool QueryStringFromBatteryInfo(SafeFileHandle battery, Kernel32.BATTERY_QUERY_INFORMATION bqi, out string value)
     {
         const int maxLoadString = 100;
 
@@ -100,7 +101,8 @@ public unsafe BatteryGroup(ISettings settings)
                                                              ref bqi.BatteryTag,
                                                              Marshal.SizeOf(bqi.BatteryTag),
                                                              out _,
-                                                             IntPtr.Zero))
+                                                             IntPtr.Zero)
+                                    && _hardware.All(x => x.BatteryTag != bqi.BatteryTag))
                                 {
                                     Kernel32.BATTERY_INFORMATION bi = default;
                                     bqi.InformationLevel = Kernel32.BATTERY_QUERY_INFORMATION_LEVEL.BatteryInformation;
@@ -126,6 +128,10 @@ public unsafe BatteryGroup(ISettings settings)
                                         }
                                     }
                                 }
+                                else
+                                {
+                                    battery.Close();
+                                }
                             }
                         }
 

OpenHardwareMonitorLib/Hardware/Computer.cs

@@ -391,7 +391,10 @@ public void Accept(IVisitor visitor)
         if (visitor == null)
             throw new ArgumentNullException(nameof(visitor));
 
-        visitor.VisitComputer(this);
+        lock (_lock)
+        {
+            visitor.VisitComputer(this);
+        }
     }
 
     /// <summary>
@@ -671,8 +674,11 @@ public void Reset()
         if (!_open)
             return;
 
-        RemoveGroups();
-        AddGroups();
+        lock (_lock)
+        {
+            RemoveGroups();
+            AddGroups();
+        }
     }
 
     private void RemoveGroups()

README.md

@@ -1,4 +1,5 @@
-# Open hardware monitor
+# Open Hardware Monitor
+
 [![Release](https://img.shields.io/github/v/release/HardwareMonitor/openhardwaremonitor)](https://github.com/HardwareMonitor/openhardwaremonitor/releases/latest)
 [![Downloads](https://img.shields.io/github/downloads/HardwareMonitor/openhardwaremonitor/total?color=ff4f42)](https://github.com/HardwareMonitor/openhardwaremonitor/releases)
 [![Last commit](https://img.shields.io/github/last-commit/HardwareMonitor/openhardwaremonitor?color=00AD00)](https://github.com/HardwareMonitor/openhardwaremonitor/commits/master)
@@ -8,9 +9,9 @@
 [![Nuget](https://img.shields.io/nuget/v/OpenHardwareMonitorLib)](https://www.nuget.org/packages/OpenHardwareMonitorLib/)
 [![Nuget](https://img.shields.io/nuget/dt/OpenHardwareMonitorLib?label=nuget-downloads)](https://www.nuget.org/packages/OpenHardwareMonitorLib/)
 
-Open hardware monitor is free software that can monitor the temperature sensors, fan speeds, voltages, load and clock speeds of your computer.
+Open Hardware Monitor is a free open source software that can monitor temperature sensors, fan speeds, voltages, load and clock speeds of a computer.
 
-This application is based on the "original" [openhardwaremonitor](https://github.com/openhardwaremonitor/openhardwaremonitor) project.
+This application is based on the original [OpenHardwareMonitor](https://github.com/openhardwaremonitor/openhardwaremonitor) project.
 
 ## Features
 
@@ -140,8 +141,9 @@ Some sensors require administrator privileges to access the data. Restart your I
 
 
 ## How can I help improve it?
-The OpenHardwareMonitor team welcomes feedback and contributions!<br/>
-You can check if it works properly on your motherboard. For many manufacturers, the way of reading data differs a bit, so if you notice any inaccuracies, please send us a pull request. If you have any suggestions or improvements, don't hesitate to create an issue.
+Your feedback and contributions are welcome! Please feel free to submit Pull Requests or report issues.
+<br/>
+Please check if it works properly on your hardware. For many manufacturers, the way of reading data differs a bit, so if you notice any inaccuracies, please send us a pull request. If you have any suggestions or improvements, don't hesitate to create an issue.
 
 Also, don't forget to ★ star ★ the repository to help other people find it.
 
@@ -151,8 +153,8 @@ Also, don't forget to ★ star ★ the repository to help other people find it.
 
 [![Forkers](https://reporoster.com/forks/HardwareMonitor/OpenHardwareMonitor)](https://github.com/HardwareMonitor/OpenHardwareMonitor/network/members)
 
-## Donate!
-Every [cup of coffee](https://patreon.com/SergiyE) you donate will help this app become better and let me know that this project is in demand.
+## Donate
+If you find this project useful, consider [supporting the author](https://patreon.com/SergiyE).
 
 ## License