Fix Corsair mouse LED names by storing name in controller object

Author: CalcProgrammer1

Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp

@@ -91,6 +91,11 @@ std::string CorsairPeripheralController::GetFirmwareString()
     return firmware_version;
 }
 
+std::string CorsairPeripheralController::GetName()
+{
+    return name;
+}
+
 void CorsairPeripheralController::SetLEDs(std::vector<RGBColor>colors)
 {
     switch(type)
@@ -270,6 +275,11 @@ void CorsairPeripheralController::SetLEDsKeyboardLimited(std::vector<RGBColor> c
     SubmitKeyboardLimitedColors(216);
 }
 
+void CorsairPeripheralController::SetName(std::string device_name)
+{
+    name = device_name;
+}
+
 /*-------------------------------------------------------------------------------------------------*\
 | Private packet sending functions.                                                                 |
 \*-------------------------------------------------------------------------------------------------*/

Controllers/CorsairPeripheralController/CorsairPeripheralController.h

@@ -74,18 +74,21 @@ class CorsairPeripheralController
     device_type     GetDeviceType();
     std::string     GetDeviceLocation();
     std::string     GetFirmwareString();
+    std::string     GetName();
 
     void            SetLEDs(std::vector<RGBColor> colors);
     void            SetLEDsKeyboardFull(std::vector<RGBColor> colors);
     void            SetLEDsKeyboardLimited(std::vector<RGBColor> colors);
     void            SetLEDsMouse(std::vector<RGBColor> colors);
     void            SetLEDsMousemat(std::vector<RGBColor> colors);
+    void            SetName(std::string device_name);
 
 private:
     hid_device*             dev;
 
     std::string             firmware_version;
     std::string             location;
+    std::string             name;
     device_type             type;
     int                     physical_layout;   //ANSI, ISO, etc.
     int                     logical_layout;    //Normal, K95 or K95 Platinum

Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp

@@ -73,10 +73,11 @@ void DetectCorsairPeripheralControllers(hid_device_info* info, const std::string
     if( dev )
     {
         CorsairPeripheralController* controller = new CorsairPeripheralController(dev, info->path);
+        controller->SetName(name);
+
         if(controller->GetDeviceType() != DEVICE_TYPE_UNKNOWN)
         {
             RGBController_CorsairPeripheral* rgb_controller = new RGBController_CorsairPeripheral(controller);
-            rgb_controller->name = name;
             ResourceManager::get()->RegisterRGBController(rgb_controller);
         }
         else

Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp

@@ -574,7 +574,7 @@ RGBController_CorsairPeripheral::RGBController_CorsairPeripheral(CorsairPeripher
 {
     corsair = corsair_ptr;
 
-    name        = "Corsair RGB Peripheral Device";
+    name        = corsair->GetName();
     vendor      = "Corsair";
     description = "Corsair RGB Peripheral Device";
     type        = corsair->GetDeviceType();