Fixing memory leaks in controllers

Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp

@@ -36,7 +36,7 @@ AMDWraithPrismController::AMDWraithPrismController(hid_device* dev_handle, const
 
 AMDWraithPrismController::~AMDWraithPrismController()
 {
-
+    hid_close(dev);
 }
 
 std::string AMDWraithPrismController::GetLocationString()

Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp

@@ -97,7 +97,7 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl
 
 RGBController_AMDWraithPrism::~RGBController_AMDWraithPrism()
 {
-
+    delete wraith;
 }
 
 void RGBController_AMDWraithPrism::SetupZones()

Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp

@@ -412,6 +412,11 @@ RGBController_Polychrome::RGBController_Polychrome(PolychromeController* polychr
     SetupZones();
 }
 
+RGBController_Polychrome::~RGBController_Polychrome()
+{
+    delete polychrome;
+}
+
 void RGBController_Polychrome::SetupZones()
 {
     switch(polychrome->GetASRockType())

Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.h

@@ -16,6 +16,7 @@ class RGBController_Polychrome : public RGBController
 {
 public:
     RGBController_Polychrome(PolychromeController* polychrome_ptr);
+    ~RGBController_Polychrome();
 
     void        SetupZones();
 

Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp

@@ -18,7 +18,7 @@ AuraCoreController::AuraCoreController(hid_device* dev_handle, const char* path)
 
 AuraCoreController::~AuraCoreController()
 {
-
+    hid_close(dev);
 }
 
 std::string AuraCoreController::GetDeviceLocation()

Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp

@@ -43,6 +43,11 @@ RGBController_AuraCore::RGBController_AuraCore(AuraCoreController* aura_ptr)
     SetupZones();
 }
 
+RGBController_AuraCore::~RGBController_AuraCore()
+{
+    delete aura;
+}
+
 void RGBController_AuraCore::SetupZones()
 {
     zone Keyboard;

Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h

@@ -15,6 +15,7 @@ class RGBController_AuraCore : public RGBController
 {
 public:
     RGBController_AuraCore(AuraCoreController* aura_ptr);
+    ~RGBController_AuraCore();
 
     void        SetupZones();
 

Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp

@@ -100,6 +100,11 @@ RGBController_AuraGPU::RGBController_AuraGPU(AuraGPUController * aura_gpu_ptr)
     active_mode = GetDeviceMode();
 }
 
+RGBController_AuraGPU::~RGBController_AuraGPU()
+{
+    delete aura_gpu;
+}
+
 void RGBController_AuraGPU::SetupZones()
 {
     /*---------------------------------------------------------*\

Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h

@@ -15,6 +15,7 @@ class RGBController_AuraGPU : public RGBController
 {
 public:
     RGBController_AuraGPU(AuraGPUController* aura_gpu_ptr);
+    ~RGBController_AuraGPU();
 
     void        SetupZones();
 

Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp

@@ -19,7 +19,7 @@ AuraMouseController::AuraMouseController(hid_device* dev_handle, const char* pat
 
 AuraMouseController::~AuraMouseController()
 {
-
+    hid_close(dev);
 }
 
 std::string AuraMouseController::GetDeviceLocation()

Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp

@@ -22,9 +22,8 @@ AuraUSBController::AuraUSBController(hid_device* dev_handle, const char* path)
 
 AuraUSBController::~AuraUSBController()
 {
-
+    hid_close(dev);
 }
-
 unsigned int AuraUSBController::GetChannelCount()
 {
     return(device_info.size());
@@ -95,11 +94,9 @@ void AuraUSBController::GetConfigTable()
         }
     }
     else
-    {
-        if(dev)
-        {
-            hid_close(dev);
-        }
+    {       
+        hid_close(dev);
+
         throw std::runtime_error("Could not read config table");
     }
 }

Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp

@@ -53,7 +53,7 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* aura_ptr)
 
 RGBController_AuraMouse::~RGBController_AuraMouse()
 {
-
+    delete aura;
 }
 
 void RGBController_AuraMouse::SetupZones()

Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp

@@ -105,7 +105,7 @@ RGBController_AuraUSB::RGBController_AuraUSB(AuraUSBController* aura_ptr) :
 
 RGBController_AuraUSB::~RGBController_AuraUSB()
 {
-
+    delete aura;
 }
 
 void RGBController_AuraUSB::SetupZones()

Controllers/CoolerMasterController/RGBController_CMARGBController.cpp

@@ -193,7 +193,7 @@ RGBController_CMARGBController::RGBController_CMARGBController(CMARGBController
 
 RGBController_CMARGBController::~RGBController_CMARGBController()
 {
-
+    delete cmargb;
 }
 
 void RGBController_CMARGBController::Init_Controller()

Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp

@@ -81,7 +81,7 @@ RGBController_CMMP750Controller::RGBController_CMMP750Controller(CMMP750Controll
 
 RGBController_CMMP750Controller::~RGBController_CMMP750Controller()
 {
-
+    delete cmmp750;
 }
 
 void RGBController_CMMP750Controller::SetupZones()

Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp

@@ -33,6 +33,11 @@ RGBController_CorsairDominatorPlatinum::RGBController_CorsairDominatorPlatinum(C
     active_mode = 0;
 }
 
+RGBController_CorsairDominatorPlatinum::~RGBController_CorsairDominatorPlatinum()
+{
+    delete corsair;
+}
+
 void RGBController_CorsairDominatorPlatinum::SetupZones()
 {
     /*---------------------------------------------------------*\

Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h

@@ -15,6 +15,7 @@ class RGBController_CorsairDominatorPlatinum : public RGBController
 {
 public:
     RGBController_CorsairDominatorPlatinum(CorsairDominatorPlatinumController* corsair_ptr);
+    ~RGBController_CorsairDominatorPlatinum();
 
     void SetupZones();
 

Controllers/CorsairHydroController/CorsairHydroController.cpp

@@ -29,6 +29,14 @@ CorsairHydroController::CorsairHydroController(libusb_device_handle* dev_handle)
     SendFirmwareRequest();
 }
 
+CorsairHydroController::~CorsairHydroController()
+{
+    if(dev)
+    {
+        libusb_close(dev);
+    }
+}
+
 std::string CorsairHydroController::GetFirmwareString()
 {
     return(firmware_version);

Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp

@@ -68,6 +68,11 @@ RGBController_CorsairHydro::RGBController_CorsairHydro(CorsairHydroController* c
     SetupZones();
 }
 
+RGBController_CorsairHydro::~RGBController_CorsairHydro()
+{
+    delete corsair;
+}
+
 void RGBController_CorsairHydro::SetupZones()
 {
     zone new_zone;

Controllers/CorsairHydroController/RGBController_CorsairHydro.h

@@ -15,6 +15,7 @@ class RGBController_CorsairHydro : public RGBController
 {
 public:
     RGBController_CorsairHydro(CorsairHydroController* corsair_ptr);
+    ~RGBController_CorsairHydro();
 
     void        SetupZones();
 

Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp

@@ -35,6 +35,8 @@ CorsairLightingNodeController::~CorsairLightingNodeController()
     keepalive_thread_run = 0;
     keepalive_thread->join();
     delete keepalive_thread;
+
+    hid_close(dev);
 }
 
 void CorsairLightingNodeController::KeepaliveThread()

Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp

@@ -167,6 +167,11 @@ RGBController_CorsairLightingNode::RGBController_CorsairLightingNode(CorsairLigh
     SetupZones();
 }
 
+RGBController_CorsairLightingNode::~RGBController_CorsairLightingNode()
+{
+    delete corsair;
+}
+
 void RGBController_CorsairLightingNode::SetupZones()
 {
     /*-------------------------------------------------*\

Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.h

@@ -15,6 +15,7 @@ class RGBController_CorsairLightingNode : public RGBController
 {
 public:
     RGBController_CorsairLightingNode(CorsairLightingNodeController* corsair_ptr);
+    ~RGBController_CorsairLightingNode();
 
     void        SetupZones();
 

Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp

@@ -60,10 +60,7 @@ CorsairPeripheralController::CorsairPeripheralController(hid_device* dev_handle,
 
 CorsairPeripheralController::~CorsairPeripheralController()
 {
-    if(dev)
-    {
-        hid_close(dev);
-    }
+    hid_close(dev);
 }
 
 device_type CorsairPeripheralController::GetDeviceType()

Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp

@@ -637,6 +637,8 @@ RGBController_CorsairPeripheral::~RGBController_CorsairPeripheral()
             delete zones[zone_index].matrix_map;
         }
     }
+
+    delete corsair;
 }
 
 void RGBController_CorsairPeripheral::SetupZones()

Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp

@@ -43,6 +43,11 @@ RGBController_CorsairVengeance::RGBController_CorsairVengeance(CorsairVengeanceC
     SetupZones();
 }
 
+RGBController_CorsairVengeance::~RGBController_CorsairVengeance()
+{
+    delete corsair;
+}
+
 void RGBController_CorsairVengeance::SetupZones()
 {
     /*---------------------------------------------------------*\

Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h

@@ -16,6 +16,7 @@ class RGBController_CorsairVengeance : public RGBController
 {
 public:
     RGBController_CorsairVengeance(CorsairVengeanceController* corsair_ptr);
+    ~RGBController_CorsairVengeance();
 
     void        SetupZones();
 

Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp

@@ -160,6 +160,11 @@ RGBController_CorsairVengeancePro::RGBController_CorsairVengeancePro(CorsairVeng
     active_mode = 9;
 }
 
+RGBController_CorsairVengeancePro::~RGBController_CorsairVengeancePro()
+{
+    delete corsair;
+}
+
 void RGBController_CorsairVengeancePro::SetupZones()
 {
     /*---------------------------------------------------------*\

Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h

@@ -16,6 +16,7 @@ class RGBController_CorsairVengeancePro : public RGBController
 {
 public:
     RGBController_CorsairVengeancePro(CorsairVengeanceProController* corsair_ptr);
+    ~RGBController_CorsairVengeancePro();
 
     void        SetupZones();
 

Controllers/CrucialController/RGBController_Crucial.cpp

@@ -116,6 +116,11 @@ RGBController_Crucial::RGBController_Crucial(CrucialController * crucial_ptr)
     SetupZones();
 }
 
+RGBController_Crucial::~RGBController_Crucial()
+{
+    delete crucial;
+}
+
 void RGBController_Crucial::SetupZones()
 {
     /*---------------------------------------------------------*\

Controllers/CrucialController/RGBController_Crucial.h

@@ -16,6 +16,7 @@ class RGBController_Crucial : public RGBController
 {
 public:
     RGBController_Crucial(CrucialController* crucial_ptr);
+    ~RGBController_Crucial();
 
     void        SetupZones();
 

Controllers/DasKeyboardController/DasKeyboardController.cpp

@@ -20,7 +20,7 @@ DasKeyboardController::DasKeyboardController(hid_device *dev_handle, const char
 
 DasKeyboardController::~DasKeyboardController()
 {
-
+    hid_close(dev);
 }
 
 std::string DasKeyboardController::GetDeviceLocation()

Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp

@@ -243,6 +243,8 @@ RGBController_DasKeyboard::~RGBController_DasKeyboard()
     {
         delete zones[zone_index].matrix_map;
     }
+
+    delete das;
 }
 
 void RGBController_DasKeyboard::SetupZones()

Controllers/DasKeyboardController/RGBController_DasKeyboard.h

@@ -25,7 +25,6 @@ class RGBController_DasKeyboard : public RGBController
 {
 public:
     RGBController_DasKeyboard(DasKeyboardController *das_ptr);
-
     ~RGBController_DasKeyboard();
 
     void SetupZones();

Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp

@@ -20,7 +20,7 @@ DuckyKeyboardController::DuckyKeyboardController(hid_device* dev_handle, const c
 
 DuckyKeyboardController::~DuckyKeyboardController()
 {
-    
+    hid_close(dev);
 }
 
 std::string DuckyKeyboardController::GetDeviceLocation()

Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp

@@ -204,6 +204,8 @@ RGBController_DuckyKeyboard::~RGBController_DuckyKeyboard()
             delete zones[zone_index].matrix_map;
         }
     }
+
+    delete ducky;
 }
 
 void RGBController_DuckyKeyboard::SetupZones()

Controllers/EKController/RGBController_EKController.cpp

@@ -113,7 +113,7 @@ RGBController_EKController::RGBController_EKController(EKController* _dev)
 
 RGBController_EKController::~RGBController_EKController()
 {
-
+    delete EK_dev;
 }
 
 void RGBController_EKController::SetupZones()

Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp

@@ -72,6 +72,11 @@ RGBController_EVGAGPUv1::RGBController_EVGAGPUv1(EVGAGPUv1Controller* evga_ptr)
     colors[0] = color;
 }
 
+RGBController_EVGAGPUv1::~RGBController_EVGAGPUv1()
+{
+    delete evga;
+}
+
 void RGBController_EVGAGPUv1::SetupZones()
 {
     /*---------------------------------------------------------*\

Controllers/EVGAGPUController/RGBController_EVGAGPUv1.h

@@ -16,6 +16,7 @@ class RGBController_EVGAGPUv1 : public RGBController
 {
 public:
     RGBController_EVGAGPUv1(EVGAGPUv1Controller* evga_ptr);
+    ~RGBController_EVGAGPUv1();
 
     void        SetupZones();
 

Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp

@@ -54,6 +54,11 @@ RGBController_EVGAGPUv2::RGBController_EVGAGPUv2(EVGAGPUv2Controller* evga_ptr)
     active_mode = 0;
 }
 
+RGBController_EVGAGPUv2::~RGBController_EVGAGPUv2()
+{
+    delete evga;
+}
+
 void RGBController_EVGAGPUv2::SetupZones()
 {
     /*---------------------------------------------------------*\

Controllers/EVGAGPUController/RGBController_EVGAGPUv2.h

@@ -16,6 +16,7 @@ class RGBController_EVGAGPUv2 : public RGBController
 {
 public:
     RGBController_EVGAGPUv2(EVGAGPUv2Controller* evga_ptr);
+    ~RGBController_EVGAGPUv2();
 
     void        SetupZones();
 

Controllers/EspurnaController/RGBController_Espurna.cpp

@@ -27,6 +27,11 @@ RGBController_Espurna::RGBController_Espurna(EspurnaController* espurna_ptr)
     SetupZones();
 }
 
+RGBController_Espurna::~RGBController_Espurna()
+{
+    delete espurna;
+}
+
 void RGBController_Espurna::SetupZones()
 {
     zone led_zone;

Controllers/EspurnaController/RGBController_Espurna.h

@@ -14,6 +14,7 @@ class RGBController_Espurna : public RGBController
 {
 public:
     RGBController_Espurna(EspurnaController* espurna_ptr);
+    ~RGBController_Espurna();
 
     void        SetupZones();
 

Controllers/FanBusController/FanBusController.cpp

@@ -14,6 +14,7 @@ FanBusController::FanBusController(FanBusInterface* bus_ptr, unsigned char dev_a
 
 FanBusController::~FanBusController()
 {
+    delete bus;
 }
 
 std::string FanBusController::GetLocation()

Controllers/FanBusController/RGBController_FanBus.cpp

@@ -27,6 +27,11 @@ RGBController_FanBus::RGBController_FanBus(FanBusController* controller_ptr)
     SetupZones();
 }
 
+RGBController_FanBus::~RGBController_FanBus()
+{
+    delete controller;
+}
+
 void RGBController_FanBus::SetupZones()
 {
     zone led_zone;
@@ -80,4 +85,4 @@ void RGBController_FanBus::SetCustomMode()
 void RGBController_FanBus::DeviceUpdateMode()
 {
 
-}
+}

Controllers/FanBusController/RGBController_FanBus.h

@@ -14,6 +14,7 @@ class RGBController_FanBus : public RGBController
 {
 public:
     RGBController_FanBus(FanBusController* controller_ptr);
+    ~RGBController_FanBus();
 
     void        SetupZones();
 

Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp

@@ -84,6 +84,11 @@ RGBController_GalaxGPU::RGBController_GalaxGPU(GalaxGPUController * galax_gpu_pt
     active_mode = GetDeviceMode();
 }
 
+RGBController_GalaxGPU::~RGBController_GalaxGPU()
+{
+    delete galax_gpu;
+}
+
 void RGBController_GalaxGPU::SetupZones()
 {
     /*---------------------------------------------------------*\

Controllers/GalaxGPUController/RGBController_GalaxGPU.h

@@ -15,6 +15,7 @@ class RGBController_GalaxGPU : public RGBController
 {
 public:
     RGBController_GalaxGPU(GalaxGPUController* galax_gpu_ptr);
+    ~RGBController_GalaxGPU();
 
     void        SetupZones();
 

Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp

@@ -67,6 +67,11 @@ RGBController_AorusATC800::RGBController_AorusATC800(ATC800Controller* cooler_pt
     SetupZones();
 }
 
+RGBController_AorusATC800::~RGBController_AorusATC800()
+{
+    delete cooler;
+}
+
 void RGBController_AorusATC800::SetupZones()
 {
     zone atc800_cpu_fans_zone;

Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.h

@@ -15,6 +15,7 @@ class RGBController_AorusATC800 : public RGBController
 {
 public:
     RGBController_AorusATC800(ATC800Controller* logitech_ptr);
+    ~RGBController_AorusATC800();
 
     void        SetupZones();
 

Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.cpp

@@ -39,6 +39,11 @@ RGBFusion2DRAMController::RGBFusion2DRAMController(i2c_smbus_interface* bus, rgb
     led_data[RGB_FUSION_2_DRAM_IDX_BRIGHTNESS] = 0x64;
 }
 
+RGBFusion2DRAMController::~RGBFusion2DRAMController()
+{
+
+}
+
 unsigned int RGBFusion2DRAMController::GetLEDCount()
 {
     return(led_count);

Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp

@@ -30,6 +30,11 @@ RGBController_RGBFusion2DRAM::RGBController_RGBFusion2DRAM(RGBFusion2DRAMControl
     SetupZones();
 }
 
+RGBController_RGBFusion2DRAM::~RGBController_RGBFusion2DRAM()
+{
+    delete rgb_fusion;
+}
+
 void RGBController_RGBFusion2DRAM::SetupZones()
 {
     /*---------------------------------------------------------*\

Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.h

@@ -16,6 +16,7 @@ class RGBController_RGBFusion2DRAM : public RGBController
 {
 public:
     RGBController_RGBFusion2DRAM(RGBFusion2DRAMController* rgb_fusion_ptr);
+    ~RGBController_RGBFusion2DRAM();
 
     void        SetupZones();
 

Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp

@@ -29,6 +29,11 @@ RGBFusion2SMBusController::RGBFusion2SMBusController(i2c_smbus_interface* bus, r
     led_count   = 10;	// Protocol supports 10 'slots'
 }
 
+RGBFusion2SMBusController::~RGBFusion2SMBusController()
+{
+
+}
+
 unsigned int RGBFusion2SMBusController::GetLEDCount()
 {
     return(led_count);

Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp

@@ -92,6 +92,11 @@ RGBController_RGBFusion2SMBus::RGBController_RGBFusion2SMBus(RGBFusion2SMBusCont
     active_mode = GetDeviceMode();
 }
 
+RGBController_RGBFusion2SMBus::~RGBController_RGBFusion2SMBus()
+{
+    delete rgb_fusion;
+}
+
 void RGBController_RGBFusion2SMBus::SetupZones()
 {
     /*---------------------------------------------------------*\

Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h

@@ -17,6 +17,7 @@ class RGBController_RGBFusion2SMBus : public RGBController
 {
 public:
     RGBController_RGBFusion2SMBus(RGBFusion2SMBusController* rgb_fusion_ptr);
+    ~RGBController_RGBFusion2SMBus();
 
     void        SetupZones();
 

Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp

@@ -67,9 +67,7 @@ RGBFusion2USBController::RGBFusion2USBController(hid_device* handle, const char
 
 RGBFusion2USBController::~RGBFusion2USBController()
 {
-    if( dev ) {
-        hid_close(dev);
-    }
+    hid_close(dev);
 }
 
 void RGBFusion2USBController::SetMode(int m)

Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp

@@ -185,6 +185,11 @@ RGBController_RGBFusion2USB::RGBController_RGBFusion2USB(RGBFusion2USBController
     SetupZones();
 }
 
+RGBController_RGBFusion2USB::~RGBController_RGBFusion2USB()
+{
+    delete controller;
+}
+
 void RGBController_RGBFusion2USB::Init_Controller()
 {
     /*---------------------------------------------------------*\

Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.h

@@ -32,6 +32,7 @@ class RGBController_RGBFusion2USB: public RGBController
 {
 public:
     RGBController_RGBFusion2USB(RGBFusion2USBController* controller_ptr);
+    ~RGBController_RGBFusion2USB();
 
     void        SetupZones();
 

Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp

@@ -59,6 +59,11 @@ RGBController_RGBFusion::RGBController_RGBFusion(RGBFusionController* rgb_fusion
     active_mode = GetDeviceMode();
 }
 
+RGBController_RGBFusion::~RGBController_RGBFusion()
+{
+    delete rgb_fusion;
+}
+
 void RGBController_RGBFusion::SetupZones()
 {
     /*---------------------------------------------------------*\

Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.h

@@ -16,6 +16,7 @@ class RGBController_RGBFusion : public RGBController
 {
 public:
     RGBController_RGBFusion(RGBFusionController* rgb_fusion_ptr);
+    ~RGBController_RGBFusion();
 
     void        SetupZones();
 

Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp

@@ -73,6 +73,11 @@ RGBController_RGBFusionGPU::RGBController_RGBFusionGPU(RGBFusionGPUController* r
     active_mode = 0;
 }
 
+RGBController_RGBFusionGPU::~RGBController_RGBFusionGPU()
+{
+    delete rgb_fusion;
+}
+
 void RGBController_RGBFusionGPU::SetupZones()
 {
     /*---------------------------------------------------------*\

Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.h

@@ -16,6 +16,7 @@ class RGBController_RGBFusionGPU : public RGBController
 {
 public:
     RGBController_RGBFusionGPU(RGBFusionGPUController* rgb_fusion_ptr);
+    ~RGBController_RGBFusionGPU();
 
     void        SetupZones();
 

Controllers/HoltekController/HoltekA070Controller.cpp

@@ -16,6 +16,11 @@ HoltekA070Controller::HoltekA070Controller(hid_device* dev_handle, const char* p
     location    = path;
 }
 
+HoltekA070Controller::~HoltekA070Controller()
+{
+    hid_close(dev);
+}
+
 std::string HoltekA070Controller::GetDeviceLocation()
 {
     return("HID: " + location);

Controllers/HoltekController/HoltekA1FAController.cpp

@@ -16,6 +16,12 @@ HoltekA1FAController::HoltekA1FAController(hid_device *dev_handle, const char *p
     location = path;
 }
 
+HoltekA1FAController::~HoltekA1FAController()
+{
+    hid_close(dev);
+}
+
+
 std::string HoltekA1FAController::GetDeviceLocation()
 {
     return ("HID: " + location);

Controllers/HoltekController/RGBController_HoltekA070.cpp

@@ -38,6 +38,11 @@ RGBController_HoltekA070::RGBController_HoltekA070(HoltekA070Controller* holtek_
     SetupZones();
 }
 
+RGBController_HoltekA070::~RGBController_HoltekA070()
+{
+    delete holtek;
+}
+
 void RGBController_HoltekA070::SetupZones()
 {
     zone mouse_zone;

Controllers/HoltekController/RGBController_HoltekA070.h

@@ -14,6 +14,7 @@ class RGBController_HoltekA070 : public RGBController
 {
 public:
     RGBController_HoltekA070(HoltekA070Controller* holtek_ptr);
+    ~RGBController_HoltekA070();
 
     void        SetupZones();
     void        ResizeZone(int zone, int new_size);

Controllers/HoltekController/RGBController_HoltekA1FA.cpp

@@ -66,6 +66,11 @@ RGBController_HoltekA1FA::RGBController_HoltekA1FA(HoltekA1FAController* holtek_
     SetupZones();
 }
 
+RGBController_HoltekA1FA::~RGBController_HoltekA1FA()
+{
+    delete holtek;
+}
+
 void RGBController_HoltekA1FA::SetupZones()
 {
     zone mouse_zone;

Controllers/HoltekController/RGBController_HoltekA1FA.h

@@ -14,6 +14,7 @@ class RGBController_HoltekA1FA : public RGBController
 {
 public:
     RGBController_HoltekA1FA(HoltekA1FAController* holtek_ptr);
+    ~RGBController_HoltekA1FA();
 
     int         previous_mode = 0;  /* previous  mode              */
 

Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp

@@ -125,6 +125,11 @@ RGBController_HyperXDRAM::RGBController_HyperXDRAM(HyperXDRAMController* hyperx_
     SetupZones();
 }
 
+RGBController_HyperXDRAM::~RGBController_HyperXDRAM()
+{
+    delete hyperx;
+}
+
 void RGBController_HyperXDRAM::SetupZones()
 {
     for(unsigned int slot = 0; slot < hyperx->GetSlotCount(); slot++)

Controllers/HyperXDRAMController/RGBController_HyperXDRAM.h

@@ -16,6 +16,7 @@ class RGBController_HyperXDRAM : public RGBController
 {
 public:
     RGBController_HyperXDRAM(HyperXDRAMController* hyperx_ptr);
+    ~RGBController_HyperXDRAM();
 
     void        SetupZones();
 

Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp

@@ -22,7 +22,7 @@ HyperXAlloyOriginsController::HyperXAlloyOriginsController(hid_device* dev_handl
 
 HyperXAlloyOriginsController::~HyperXAlloyOriginsController()
 {
-
+    hid_close(dev);
 }
 
 std::string HyperXAlloyOriginsController::GetDeviceLocation()

Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp

@@ -35,7 +35,7 @@ HyperXKeyboardController::HyperXKeyboardController(hid_device* dev_handle, const
 
 HyperXKeyboardController::~HyperXKeyboardController()
 {
-
+    hid_close(dev);
 }
 
 std::string HyperXKeyboardController::GetDeviceLocation()

Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp

@@ -213,6 +213,8 @@ RGBController_HyperXAlloyOrigins::~RGBController_HyperXAlloyOrigins()
             delete zones[zone_index].matrix_map;
         }
     }
+
+    delete hyperx;
 }
 
 void RGBController_HyperXAlloyOrigins::SetupZones()

Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp

@@ -252,6 +252,8 @@ RGBController_HyperXKeyboard::~RGBController_HyperXKeyboard()
             delete zones[zone_index].matrix_map;
         }
     }
+
+    delete hyperx;
 }
 
 void RGBController_HyperXKeyboard::SetupZones()

Controllers/HyperXMouseController/HyperXPulsefireFPSProController.cpp

@@ -19,7 +19,7 @@ HyperXPulsefireFPSProController::HyperXPulsefireFPSProController(hid_device* dev
 
 HyperXPulsefireFPSProController::~HyperXPulsefireFPSProController()
 {
-
+    hid_close(dev);
 }
 
 std::string HyperXPulsefireFPSProController::GetDeviceLocation()

Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp

@@ -19,7 +19,7 @@ HyperXPulsefireSurgeController::HyperXPulsefireSurgeController(hid_device* dev_h
 
 HyperXPulsefireSurgeController::~HyperXPulsefireSurgeController()
 {
-
+    hid_close(dev);
 }
 
 std::string HyperXPulsefireSurgeController::GetDeviceLocation()

Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp

@@ -46,6 +46,8 @@ RGBController_HyperXPulsefireFPSPro::~RGBController_HyperXPulsefireFPSPro()
     keepalive_thread_run = 0;
     keepalive_thread->join();
     delete keepalive_thread;
+
+    delete hyperx;
 }
 
 void RGBController_HyperXPulsefireFPSPro::SetupZones()

Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp

@@ -46,6 +46,8 @@ RGBController_HyperXPulsefireSurge::~RGBController_HyperXPulsefireSurge()
     keepalive_thread_run = 0;
     keepalive_thread->join();
     delete keepalive_thread;
+
+    delete hyperx;
 }
 
 void RGBController_HyperXPulsefireSurge::SetupZones()

Controllers/HyperXMousematController/HyperXMousematController.cpp

@@ -19,7 +19,7 @@ HyperXMousematController::HyperXMousematController(hid_device* dev_handle, const
 
 HyperXMousematController::~HyperXMousematController()
 {
-
+    hid_close(dev);
 }
 
 std::string HyperXMousematController::GetDeviceLocation()

Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp

@@ -46,6 +46,8 @@ RGBController_HyperXMousemat::~RGBController_HyperXMousemat()
     keepalive_thread_run = 0;
     keepalive_thread->join();
     delete keepalive_thread;
+
+    delete hyperx;
 }
 
 void RGBController_HyperXMousemat::SetupZones()

Controllers/LEDStripController/RGBController_LEDStrip.cpp

@@ -29,6 +29,11 @@ RGBController_LEDStrip::RGBController_LEDStrip(LEDStripController* ledstrip_ptr)
     SetupZones();
 }
 
+RGBController_LEDStrip::~RGBController_LEDStrip()
+{
+    delete strip;
+}
+
 void RGBController_LEDStrip::SetupZones()
 {
     zone led_zone;

Controllers/LEDStripController/RGBController_LEDStrip.h

@@ -16,6 +16,7 @@ class RGBController_LEDStrip : public RGBController
 {
 public:
     RGBController_LEDStrip(LEDStripController* ledstrip_ptr);
+    ~RGBController_LEDStrip();
 
     void        SetupZones();
 

Controllers/LinuxLEDController/RGBController_LinuxLED.cpp

@@ -30,6 +30,11 @@ RGBController_LinuxLED::RGBController_LinuxLED(LinuxLEDController* controller_pt
     SetupZones();
 }
 
+RGBController_LinuxLED::~RGBController_LinuxLED()
+{
+    delete controller;
+}
+
 void RGBController_LinuxLED::SetupZones()
 {
     zone led_zone;

Controllers/LinuxLEDController/RGBController_LinuxLED.h

@@ -14,6 +14,7 @@ class RGBController_LinuxLED : public RGBController
 {
 public:
     RGBController_LinuxLED(LinuxLEDController* controller_ptr);
+    ~RGBController_LinuxLED();
 
     void        SetupZones();
 

Controllers/LogitechController/LogitechControllerDetect.cpp

@@ -93,14 +93,8 @@ void DetectLogitechKeyboardG810(hid_device_info* info, const std::string& name)
      else
      {
          // Not all of them could be opened, do some cleanup
-         if(dev_usage_0x0602)
-         {
-             hid_close(dev_usage_0x0602);
-         }
-         if(dev_usage_0x0604)
-         {
-             hid_close(dev_usage_0x0604);
-         }
+         hid_close(dev_usage_0x0602);
+         hid_close(dev_usage_0x0604);
      }
 #else
     hid_device* dev = hid_open_path(info->path);

Controllers/LogitechController/LogitechG203Controller.cpp

@@ -17,6 +17,11 @@ LogitechG203Controller::LogitechG203Controller(hid_device* dev_handle, const cha
     location    = path;
 }
 
+LogitechG203Controller::~LogitechG203Controller()
+{
+    hid_close(dev);
+}
+
 std::string LogitechG203Controller::GetDeviceLocation()
 {
     return("HID " + location);

Controllers/LogitechController/LogitechG203LController.cpp

@@ -8,6 +8,11 @@ LogitechG203LController::LogitechG203LController(hid_device* dev_handle, const c
     location    = path;
 }
 
+LogitechG203LController::~LogitechG203LController()
+{
+    hid_close(dev);
+}
+
 std::string LogitechG203LController::GetDeviceLocation()
 {
     return("HID: " + location);

Controllers/LogitechController/LogitechG810Controller.cpp

@@ -18,7 +18,8 @@ LogitechG810Controller::LogitechG810Controller(hid_device* dev_handle_0x11, hid_
 
 LogitechG810Controller::~LogitechG810Controller()
 {
-
+    hid_close(dev_pkt_0x11);
+    hid_close(dev_pkt_0x12);
 }
 
 std::string LogitechG810Controller::GetSerialString()

Controllers/LogitechController/RGBController_LogitechG203.cpp

@@ -57,6 +57,11 @@ RGBController_LogitechG203::RGBController_LogitechG203(LogitechG203Controller* l
     SetupZones();
 }
 
+RGBController_LogitechG203::~RGBController_LogitechG203()
+{
+    delete logitech;
+}
+
 void RGBController_LogitechG203::SetupZones()
 {
     zone g203_zone;

Controllers/LogitechController/RGBController_LogitechG203.h

@@ -15,6 +15,7 @@ class RGBController_LogitechG203 : public RGBController
 {
 public:
     RGBController_LogitechG203(LogitechG203Controller* logitech_ptr);
+    ~RGBController_LogitechG203();
 
     void        SetupZones();
 
@@ -29,4 +30,4 @@ public:
 
 private:
     LogitechG203Controller*   logitech;
-};
+};

Controllers/LogitechController/RGBController_LogitechG203L.cpp

@@ -73,6 +73,11 @@ RGBController_LogitechG203L::RGBController_LogitechG203L(LogitechG203LController
     SetupZones();
 }
 
+RGBController_LogitechG203L::~RGBController_LogitechG203L()
+{
+    delete logitech;
+}
+
 void RGBController_LogitechG203L::SetupZones()
 {
     zone g203L_zone;

Controllers/LogitechController/RGBController_LogitechG203L.h

@@ -6,6 +6,7 @@ class RGBController_LogitechG203L : public RGBController
 {
 public:
     RGBController_LogitechG203L(LogitechG203LController* logitech_ptr);
+    ~RGBController_LogitechG203L();
 
     void        SetupZones();
     
@@ -20,4 +21,4 @@ public:
 
 private:
     LogitechG203LController*    logitech;
-};
+};

Controllers/LogitechController/RGBController_LogitechG213.cpp

@@ -51,7 +51,7 @@ RGBController_LogitechG213::RGBController_LogitechG213(LogitechG213Controller* l
 
 RGBController_LogitechG213::~RGBController_LogitechG213()
 {
-
+    delete logitechG213;
 }
 
 void RGBController_LogitechG213::SetupZones()

Controllers/LogitechController/RGBController_LogitechG403.cpp

@@ -57,6 +57,11 @@ RGBController_LogitechG403::RGBController_LogitechG403(LogitechG403Controller* l
     SetupZones();
 }
 
+RGBController_LogitechG403::~RGBController_LogitechG403()
+{
+    delete logitech;
+}
+
 void RGBController_LogitechG403::SetupZones()
 {
     zone G403_wheel_zone;

Controllers/LogitechController/RGBController_LogitechG403.h

@@ -15,6 +15,7 @@ class RGBController_LogitechG403 : public RGBController
 {
 public:
     RGBController_LogitechG403(LogitechG403Controller* logitech_ptr);
+    ~RGBController_LogitechG403();
 
     void        SetupZones();
 

Controllers/LogitechController/RGBController_LogitechG502PS.cpp

@@ -57,6 +57,11 @@ RGBController_LogitechG502PS::RGBController_LogitechG502PS(LogitechG502PSControl
     SetupZones();
 }
 
+RGBController_LogitechG502PS::~RGBController_LogitechG502PS()
+{
+    delete logitech;
+}
+
 void RGBController_LogitechG502PS::SetupZones()
 {
     zone G502_PS_side_zone;

Controllers/LogitechController/RGBController_LogitechG502PS.h

@@ -15,6 +15,7 @@ class RGBController_LogitechG502PS : public RGBController
 {
 public:
     RGBController_LogitechG502PS(LogitechG502PSController* logitech_ptr);
+    ~RGBController_LogitechG502PS();
 
     void        SetupZones();
 
@@ -29,4 +30,4 @@ public:
 
 private:
     LogitechG502PSController*   logitech;
-};
+};

Controllers/LogitechController/RGBController_LogitechG810.cpp

@@ -237,6 +237,8 @@ RGBController_LogitechG810::~RGBController_LogitechG810()
             delete zones[zone_index].matrix_map;
         }
     }
+
+    delete logitech;
 }
 
 void RGBController_LogitechG810::SetupZones()

Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp

@@ -57,6 +57,11 @@ RGBController_LogitechGPowerPlay::RGBController_LogitechGPowerPlay(LogitechGPowe
     SetupZones();
 }
 
+RGBController_LogitechGPowerPlay::~RGBController_LogitechGPowerPlay()
+{
+    delete logitech;
+}
+
 void RGBController_LogitechGPowerPlay::SetupZones()
 {
     zone GPowerPlay_logo_zone;