From e418aa7f95a351824b8199fd9ade3eb0cf045f4c Mon Sep 17 00:00:00 2001
From: Adam Honse <calcprogrammer1@gmail.com>
Date: Thu, 14 Aug 2025 19:00:39 -0500
Subject: [PATCH] Store name in NZXTMouseController to avoid setting it in
 detector

---
 Controllers/NZXTMouseController/NZXTMouseController.cpp   | 8 +++++++-
 Controllers/NZXTMouseController/NZXTMouseController.h     | 4 +++-
 .../NZXTMouseController/NZXTMouseControllerDetect.cpp     | 3 +--
 .../NZXTMouseController/RGBController_NZXTMouse.cpp       | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Controllers/NZXTMouseController/NZXTMouseController.cpp b/Controllers/NZXTMouseController/NZXTMouseController.cpp
index 6bffc8ca..1d197e3a 100644
--- a/Controllers/NZXTMouseController/NZXTMouseController.cpp
+++ b/Controllers/NZXTMouseController/NZXTMouseController.cpp
@@ -13,10 +13,11 @@
 #include "NZXTMouseController.h"
 #include "StringUtils.h"
 
-NZXTMouseController::NZXTMouseController(hid_device* dev_handle, const char* path)
+NZXTMouseController::NZXTMouseController(hid_device* dev_handle, const char* path, std::string dev_name)
 {
     dev         = dev_handle;
     location    = path;
+    name        = dev_name;
 
     /*-----------------------------------------------------*\
     | Request firmware version                              |
@@ -39,6 +40,11 @@ std::string NZXTMouseController::GetLocation()
     return("HID: " + location);
 }
 
+std::string NZXTMouseController::GetName()
+{
+    return(name);
+}
+
 std::string NZXTMouseController::GetSerialString()
 {
     wchar_t serial_string[128];
diff --git a/Controllers/NZXTMouseController/NZXTMouseController.h b/Controllers/NZXTMouseController/NZXTMouseController.h
index 1f430a88..c4f8edc5 100644
--- a/Controllers/NZXTMouseController/NZXTMouseController.h
+++ b/Controllers/NZXTMouseController/NZXTMouseController.h
@@ -19,11 +19,12 @@
 class NZXTMouseController
 {
 public:
-    NZXTMouseController(hid_device* dev_handle, const char* path);
+    NZXTMouseController(hid_device* dev_handle, const char* path, std::string dev_name);
     ~NZXTMouseController();
 
     std::string     GetFirmwareVersion();
     std::string     GetLocation();
+    std::string     GetName();
     std::string     GetSerialString();
 
     void            SetLEDs
@@ -36,6 +37,7 @@ private:
 
     char            firmware_version[16];
     std::string     location;
+    std::string     name;
 
     void            SendFirmwareRequest();
 };
diff --git a/Controllers/NZXTMouseController/NZXTMouseControllerDetect.cpp b/Controllers/NZXTMouseController/NZXTMouseControllerDetect.cpp
index 7186a893..8c92a916 100644
--- a/Controllers/NZXTMouseController/NZXTMouseControllerDetect.cpp
+++ b/Controllers/NZXTMouseController/NZXTMouseControllerDetect.cpp
@@ -34,9 +34,8 @@ static void DetectNZXTMouseControllers(hid_device_info* info, const std::string&
 
     if(dev)
     {
-        NZXTMouseController*     controller     = new NZXTMouseController(dev, info->path);
+        NZXTMouseController*     controller     = new NZXTMouseController(dev, info->path, name);
         RGBController_NZXTMouse* rgb_controller = new RGBController_NZXTMouse(controller);
-        rgb_controller->name                    = name;
 
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
diff --git a/Controllers/NZXTMouseController/RGBController_NZXTMouse.cpp b/Controllers/NZXTMouseController/RGBController_NZXTMouse.cpp
index 89d54f3e..dd25756e 100644
--- a/Controllers/NZXTMouseController/RGBController_NZXTMouse.cpp
+++ b/Controllers/NZXTMouseController/RGBController_NZXTMouse.cpp
@@ -26,7 +26,7 @@ RGBController_NZXTMouse::RGBController_NZXTMouse(NZXTMouseController* controller
 {
     controller          = controller_ptr;
 
-    name                = "NZXT Mouse";
+    name                = controller->GetName();
     vendor              = "NZXT";
     type                = DEVICE_TYPE_MOUSE;
     description         = "NZXT Mouse Device";