From ea206235c5e0a63e251fdae97b99d0d6f9516c89 Mon Sep 17 00:00:00 2001
From: Adam Honse <calcprogrammer1@gmail.com>
Date: Wed, 6 Aug 2025 08:33:36 -0500
Subject: [PATCH] Store name in CryorigH7QuadLumiController to avoid setting it
 in detector

---
 .../CryorigH7QuadLumiController.cpp                       | 8 +++++++-
 .../CryorigH7QuadLumiController.h                         | 4 +++-
 .../CryorigH7QuadLumiControllerDetect.cpp                 | 3 +--
 .../RGBController_CryorigH7QuadLumi.cpp                   | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiController.cpp b/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiController.cpp
index 06abb8f1..6e9e4d82 100644
--- a/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiController.cpp
+++ b/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiController.cpp
@@ -17,10 +17,11 @@
 #include "LogManager.h"
 #include "StringUtils.h"
 
-CryorigH7QuadLumiController::CryorigH7QuadLumiController(hid_device* dev_handle, const char* path)
+CryorigH7QuadLumiController::CryorigH7QuadLumiController(hid_device* dev_handle, const char* path, std::string dev_name)
 {
     dev         = dev_handle;
     location    = path;
+    name        = dev_name;
 
     SendFirmwareRequest();
 }
@@ -35,6 +36,11 @@ std::string CryorigH7QuadLumiController::GetLocation()
     return("HID: " + location);
 }
 
+std::string CryorigH7QuadLumiController::GetName()
+{
+    return(name);
+}
+
 std::string CryorigH7QuadLumiController::GetFirmwareVersion()
 {
     return(firmware_version);
diff --git a/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiController.h b/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiController.h
index c656f455..65f54583 100644
--- a/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiController.h
+++ b/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiController.h
@@ -48,11 +48,12 @@ enum
 class CryorigH7QuadLumiController
 {
 public:
-    CryorigH7QuadLumiController(hid_device* dev_handle, const char* path);
+    CryorigH7QuadLumiController(hid_device* dev_handle, const char* path, std::string dev_name);
     ~CryorigH7QuadLumiController();
 
     std::string     GetFirmwareVersion();
     std::string     GetLocation();
+    std::string     GetName();
     std::string     GetSerialString();
 
     void            SetChannelEffect
@@ -77,6 +78,7 @@ private:
 
     char            firmware_version[16];
     std::string     location;
+    std::string     name;
 
     void            SendPacket
                         (
diff --git a/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiControllerDetect.cpp b/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiControllerDetect.cpp
index 3b02c601..c773e2b6 100644
--- a/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiControllerDetect.cpp
+++ b/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiControllerDetect.cpp
@@ -26,9 +26,8 @@ static void DetectCryorigH7QuadLumi(hid_device_info* info, const std::string& na
 
     if(dev)
     {
-        CryorigH7QuadLumiController*     controller     = new CryorigH7QuadLumiController(dev, info->path);
+        CryorigH7QuadLumiController*     controller     = new CryorigH7QuadLumiController(dev, info->path, name);
         RGBController_CryorigH7QuadLumi* rgb_controller = new RGBController_CryorigH7QuadLumi(controller);
-        rgb_controller->name                            = name;
 
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
diff --git a/Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.cpp b/Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.cpp
index 1afb24e9..25ed78d0 100644
--- a/Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.cpp
+++ b/Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.cpp
@@ -26,7 +26,7 @@ RGBController_CryorigH7QuadLumi::RGBController_CryorigH7QuadLumi(CryorigH7QuadLu
 {
     controller  = controller_ptr;
 
-    name        = "CRYORIG H7 Quad Lumi";
+    name        = controller->GetName();
     vendor      = "CRYORIG";
     type        = DEVICE_TYPE_COOLER;
     description = "CRYORIG H7 Quad Lumi Device";