From d796fcba8f05150eead5007b1ea9049684213761 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Fri, 27 Jun 2025 01:26:29 -0500 Subject: [PATCH] Add detection message for reading SPD information and rework IsAnyDimmDetectorEnabled so that it doesn't overwrite the detection string before the GUI can read it --- ResourceManager.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ResourceManager.cpp b/ResourceManager.cpp index 9c627d8d..7016d0bf 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -1175,6 +1175,10 @@ void ResourceManager::DetectDevicesCoroutine() LOG_INFO("------------------------------------------------------"); LOG_INFO("| Detecting I2C DIMM modules |"); LOG_INFO("------------------------------------------------------"); + + detection_string = "Reading DRAM SPD Information"; + DetectionProgressChanged(); + for(unsigned int bus = 0; bus < busses.size() && IsAnyDimmDetectorEnabled(detector_settings); bus++) { IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) @@ -1938,12 +1942,12 @@ bool ResourceManager::IsAnyDimmDetectorEnabled(json &detector_settings) { for(unsigned int i2c_detector_idx = 0; i2c_detector_idx < i2c_dimm_device_detectors.size() && detection_is_required.load(); i2c_detector_idx++) { - detection_string = i2c_dimm_device_detectors[i2c_detector_idx].name.c_str(); + std::string detector_name_string = i2c_dimm_device_detectors[i2c_detector_idx].name.c_str(); /*-------------------------------------------------*\ | Check if this detector is enabled | \*-------------------------------------------------*/ - if(detector_settings.contains("detectors") && detector_settings["detectors"].contains(detection_string) && - detector_settings["detectors"][detection_string] == true) + if(detector_settings.contains("detectors") && detector_settings["detectors"].contains(detector_name_string) && + detector_settings["detectors"][detector_name_string] == true) { return true; }