Merge remote-tracking branch 'lib/master'

Author: sergiye

OpenHardwareMonitor/UI/MainForm.cs

@@ -870,15 +870,15 @@ private void SysTrayHideShow()
 
     protected override void WndProc(ref Message m)
     {
-        if (_minimizeToTray.Value && m.Msg == WinApiConstants.WM_SYS_COMMAND && m.WParam.ToInt64() == WinApiConstants.SC_MINIMIZE)
+        if (_minimizeToTray.Value && m.Msg == WinApiHelper.WM_SYS_COMMAND && m.WParam.ToInt64() == WinApiHelper.SC_MINIMIZE)
         {
             SysTrayHideShow();
         }
         //else if (m.Msg == WinApiHelper.WM_WININICHANGE && Marshal.PtrToStringUni(m.LParam) == "ImmersiveColorSet" && Theme.IsAutoThemeEnabled)
         //{
         //    Theme.SetAutoTheme();
         //}
-        else if (_minimizeOnClose.Value && m.Msg == WinApiConstants.WM_SYS_COMMAND && m.WParam.ToInt64() == WinApiConstants.SC_CLOSE)
+        else if (_minimizeOnClose.Value && m.Msg == WinApiHelper.WM_SYS_COMMAND && m.WParam.ToInt64() == WinApiHelper.SC_CLOSE)
         {
             //Apparently the user wants to minimize rather than close
             //Now we still need to check if we're going to the tray or not

OpenHardwareMonitorLib/Hardware/Memory/MemoryGroup.cs

@@ -161,6 +161,8 @@ private static bool DetectThermalSensors(out List<SPDAccessor> accessors)
 
     private void AddDimms(List<SPDAccessor> accessors, ISettings settings)
     {
+        List<Hardware> additions = [];
+
         foreach (SPDAccessor ram in accessors)
         {
             //Default value
@@ -171,9 +173,11 @@ private void AddDimms(List<SPDAccessor> accessors, ISettings settings)
                 name = $"{ram.GetModuleManufacturerString()} - {ram.ModulePartNumber()} (#{ram.Index})";
 
             DimmMemory memory = new(ram, name, new Identifier($"memory/dimm/{ram.Index}"), settings);
-
-            _hardware.Add(memory);
-            HardwareAdded?.Invoke(memory);
+            additions.Add(memory);
         }
+
+        _hardware = [.. _hardware, .. additions];
+        foreach (Hardware hardware in additions)
+            HardwareAdded?.Invoke(hardware);
     }
 }