diff --git a/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp b/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp index e44d1e0d..30cd69af 100644 --- a/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp +++ b/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp @@ -36,7 +36,7 @@ AMDWraithPrismController::AMDWraithPrismController(hid_device* dev_handle, const AMDWraithPrismController::~AMDWraithPrismController() { - + hid_close(dev); } std::string AMDWraithPrismController::GetLocationString() diff --git a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp index 48a074cb..6ecb4f4a 100644 --- a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp +++ b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp @@ -97,7 +97,7 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl RGBController_AMDWraithPrism::~RGBController_AMDWraithPrism() { - + delete wraith; } void RGBController_AMDWraithPrism::SetupZones() diff --git a/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp index 19b892f6..2888fa19 100644 --- a/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp +++ b/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()) diff --git a/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.h b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.h index f6781a4e..86a6ee8d 100644 --- a/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.h +++ b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.h @@ -16,6 +16,7 @@ class RGBController_Polychrome : public RGBController { public: RGBController_Polychrome(PolychromeController* polychrome_ptr); + ~RGBController_Polychrome(); void SetupZones(); diff --git a/Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp b/Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp index 4977e265..caddcf91 100644 --- a/Controllers/AsusAuraCoreController/AsusAuraCoreController.cpp +++ b/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() diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp index 0ec8d3e9..70cb5763 100644 --- a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp +++ b/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; diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h index d1150597..c2a54a79 100644 --- a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h +++ b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h @@ -15,6 +15,7 @@ class RGBController_AuraCore : public RGBController { public: RGBController_AuraCore(AuraCoreController* aura_ptr); + ~RGBController_AuraCore(); void SetupZones(); diff --git a/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp index 6fa0541c..9d8f7d0b 100644 --- a/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h index c13e5a93..3aae9790 100644 --- a/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h +++ b/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(); diff --git a/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp b/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp index a0784a1c..b83ca37e 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp +++ b/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() diff --git a/Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp index 932035c2..4a6905aa 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraUSBController.cpp +++ b/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"); } } diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp index fdab10bf..90296afb 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp +++ b/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() diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp index 34e29478..870ffc55 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp +++ b/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() diff --git a/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp b/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp index 81306030..79aa8ea1 100644 --- a/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp +++ b/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() diff --git a/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp b/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp index 759fb8c0..b55f4478 100644 --- a/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp @@ -81,7 +81,7 @@ RGBController_CMMP750Controller::RGBController_CMMP750Controller(CMMP750Controll RGBController_CMMP750Controller::~RGBController_CMMP750Controller() { - + delete cmmp750; } void RGBController_CMMP750Controller::SetupZones() diff --git a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp index c4c0be6e..4a87387c 100644 --- a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h index 7b390632..a36947c2 100644 --- a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h +++ b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h @@ -15,6 +15,7 @@ class RGBController_CorsairDominatorPlatinum : public RGBController { public: RGBController_CorsairDominatorPlatinum(CorsairDominatorPlatinumController* corsair_ptr); + ~RGBController_CorsairDominatorPlatinum(); void SetupZones(); diff --git a/Controllers/CorsairHydroController/CorsairHydroController.cpp b/Controllers/CorsairHydroController/CorsairHydroController.cpp index 2fbd89dd..638edd1f 100644 --- a/Controllers/CorsairHydroController/CorsairHydroController.cpp +++ b/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); diff --git a/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp b/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp index d56bf223..672464d2 100644 --- a/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp +++ b/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; diff --git a/Controllers/CorsairHydroController/RGBController_CorsairHydro.h b/Controllers/CorsairHydroController/RGBController_CorsairHydro.h index 97c54977..ceca8ec9 100644 --- a/Controllers/CorsairHydroController/RGBController_CorsairHydro.h +++ b/Controllers/CorsairHydroController/RGBController_CorsairHydro.h @@ -15,6 +15,7 @@ class RGBController_CorsairHydro : public RGBController { public: RGBController_CorsairHydro(CorsairHydroController* corsair_ptr); + ~RGBController_CorsairHydro(); void SetupZones(); diff --git a/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp b/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp index 0bb8933e..0966d7f6 100644 --- a/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.cpp +++ b/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() diff --git a/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp b/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp index 3a15e2c1..183f9bd5 100644 --- a/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp +++ b/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() { /*-------------------------------------------------*\ diff --git a/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.h b/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.h index aaa0a230..c14885ec 100644 --- a/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.h +++ b/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.h @@ -15,6 +15,7 @@ class RGBController_CorsairLightingNode : public RGBController { public: RGBController_CorsairLightingNode(CorsairLightingNodeController* corsair_ptr); + ~RGBController_CorsairLightingNode(); void SetupZones(); diff --git a/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp b/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp index 0ef925c9..dd5304f7 100644 --- a/Controllers/CorsairPeripheralController/CorsairPeripheralController.cpp +++ b/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() diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp index 6f4e7cd1..60f6c668 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp +++ b/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() diff --git a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp index ff504a01..428af1f4 100644 --- a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h index e0d94f17..e455e580 100644 --- a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h +++ b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h @@ -16,6 +16,7 @@ class RGBController_CorsairVengeance : public RGBController { public: RGBController_CorsairVengeance(CorsairVengeanceController* corsair_ptr); + ~RGBController_CorsairVengeance(); void SetupZones(); diff --git a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp index 7c631ee7..6322c69e 100644 --- a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h index d89ca24e..35c3d079 100644 --- a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h +++ b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h @@ -16,6 +16,7 @@ class RGBController_CorsairVengeancePro : public RGBController { public: RGBController_CorsairVengeancePro(CorsairVengeanceProController* corsair_ptr); + ~RGBController_CorsairVengeancePro(); void SetupZones(); diff --git a/Controllers/CrucialController/RGBController_Crucial.cpp b/Controllers/CrucialController/RGBController_Crucial.cpp index 7502d93d..23599ecb 100644 --- a/Controllers/CrucialController/RGBController_Crucial.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/CrucialController/RGBController_Crucial.h b/Controllers/CrucialController/RGBController_Crucial.h index c9da559e..28d05078 100644 --- a/Controllers/CrucialController/RGBController_Crucial.h +++ b/Controllers/CrucialController/RGBController_Crucial.h @@ -16,6 +16,7 @@ class RGBController_Crucial : public RGBController { public: RGBController_Crucial(CrucialController* crucial_ptr); + ~RGBController_Crucial(); void SetupZones(); diff --git a/Controllers/DasKeyboardController/DasKeyboardController.cpp b/Controllers/DasKeyboardController/DasKeyboardController.cpp index c7dec5d2..40eb413d 100644 --- a/Controllers/DasKeyboardController/DasKeyboardController.cpp +++ b/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() diff --git a/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp b/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp index d91e83cd..6dd1305f 100644 --- a/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp +++ b/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() diff --git a/Controllers/DasKeyboardController/RGBController_DasKeyboard.h b/Controllers/DasKeyboardController/RGBController_DasKeyboard.h index 64f3b7da..7c0d4126 100644 --- a/Controllers/DasKeyboardController/RGBController_DasKeyboard.h +++ b/Controllers/DasKeyboardController/RGBController_DasKeyboard.h @@ -25,7 +25,6 @@ class RGBController_DasKeyboard : public RGBController { public: RGBController_DasKeyboard(DasKeyboardController *das_ptr); - ~RGBController_DasKeyboard(); void SetupZones(); diff --git a/Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp b/Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp index d87b416d..b1578faa 100644 --- a/Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp +++ b/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() diff --git a/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp b/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp index 5374bcbd..74bf284a 100644 --- a/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp +++ b/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() diff --git a/Controllers/EKController/RGBController_EKController.cpp b/Controllers/EKController/RGBController_EKController.cpp index aeefd7da..8a34a9bb 100644 --- a/Controllers/EKController/RGBController_EKController.cpp +++ b/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() diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp b/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp index 95ef2135..d4151554 100644 --- a/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.h b/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.h index cb27a0fd..c0ffbb8e 100644 --- a/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.h +++ b/Controllers/EVGAGPUController/RGBController_EVGAGPUv1.h @@ -16,6 +16,7 @@ class RGBController_EVGAGPUv1 : public RGBController { public: RGBController_EVGAGPUv1(EVGAGPUv1Controller* evga_ptr); + ~RGBController_EVGAGPUv1(); void SetupZones(); diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp b/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp index 146611f0..6d876cc9 100644 --- a/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.h b/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.h index d0729bf5..acc288f7 100644 --- a/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.h +++ b/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.h @@ -16,6 +16,7 @@ class RGBController_EVGAGPUv2 : public RGBController { public: RGBController_EVGAGPUv2(EVGAGPUv2Controller* evga_ptr); + ~RGBController_EVGAGPUv2(); void SetupZones(); diff --git a/Controllers/EspurnaController/RGBController_Espurna.cpp b/Controllers/EspurnaController/RGBController_Espurna.cpp index 5e1f066d..e8ee1518 100644 --- a/Controllers/EspurnaController/RGBController_Espurna.cpp +++ b/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; diff --git a/Controllers/EspurnaController/RGBController_Espurna.h b/Controllers/EspurnaController/RGBController_Espurna.h index cd41593e..d4c8018d 100644 --- a/Controllers/EspurnaController/RGBController_Espurna.h +++ b/Controllers/EspurnaController/RGBController_Espurna.h @@ -14,6 +14,7 @@ class RGBController_Espurna : public RGBController { public: RGBController_Espurna(EspurnaController* espurna_ptr); + ~RGBController_Espurna(); void SetupZones(); diff --git a/Controllers/FanBusController/FanBusController.cpp b/Controllers/FanBusController/FanBusController.cpp index 5b6c6210..59e83904 100644 --- a/Controllers/FanBusController/FanBusController.cpp +++ b/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() diff --git a/Controllers/FanBusController/RGBController_FanBus.cpp b/Controllers/FanBusController/RGBController_FanBus.cpp index c92936e8..14e71b37 100644 --- a/Controllers/FanBusController/RGBController_FanBus.cpp +++ b/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() { -} \ No newline at end of file +} diff --git a/Controllers/FanBusController/RGBController_FanBus.h b/Controllers/FanBusController/RGBController_FanBus.h index 0e74bdab..70e44e6e 100644 --- a/Controllers/FanBusController/RGBController_FanBus.h +++ b/Controllers/FanBusController/RGBController_FanBus.h @@ -14,6 +14,7 @@ class RGBController_FanBus : public RGBController { public: RGBController_FanBus(FanBusController* controller_ptr); + ~RGBController_FanBus(); void SetupZones(); diff --git a/Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp b/Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp index f29fe07a..81c5528d 100644 --- a/Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/GalaxGPUController/RGBController_GalaxGPU.h b/Controllers/GalaxGPUController/RGBController_GalaxGPU.h index 45c2c6a0..f1fe992d 100644 --- a/Controllers/GalaxGPUController/RGBController_GalaxGPU.h +++ b/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(); diff --git a/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp b/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp index 21854446..1b4ed0e5 100644 --- a/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp +++ b/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; diff --git a/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.h b/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.h index 47ef52b7..3b953841 100644 --- a/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.h +++ b/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.h @@ -15,6 +15,7 @@ class RGBController_AorusATC800 : public RGBController { public: RGBController_AorusATC800(ATC800Controller* logitech_ptr); + ~RGBController_AorusATC800(); void SetupZones(); diff --git a/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.cpp b/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.cpp index fbd81898..e669c9e8 100644 --- a/Controllers/GigabyteRGBFusion2DRAMController/GigabyteRGBFusion2DRAMController.cpp +++ b/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); diff --git a/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp b/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp index 71a408d3..54e176c2 100644 --- a/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.h b/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.h index b723b646..5b097bbe 100644 --- a/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.h +++ b/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(); diff --git a/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp b/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp index df841ed5..b2954eb6 100644 --- a/Controllers/GigabyteRGBFusion2SMBusController/GigabyteRGBFusion2SMBusController.cpp +++ b/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); diff --git a/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp index ae7784b6..94df99e0 100644 --- a/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h index 3392d2f9..3ca521ce 100644 --- a/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.h +++ b/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(); diff --git a/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp index ad29a939..e660c2e8 100644 --- a/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp +++ b/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) diff --git a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp index 2b592c19..29745ccc 100644 --- a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.h b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.h index b98f6591..8acc7468 100644 --- a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.h +++ b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.h @@ -32,6 +32,7 @@ class RGBController_RGBFusion2USB: public RGBController { public: RGBController_RGBFusion2USB(RGBFusion2USBController* controller_ptr); + ~RGBController_RGBFusion2USB(); void SetupZones(); diff --git a/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp b/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp index b3139fe7..1e052f92 100644 --- a/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.h b/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.h index d562b0f6..54a4beb8 100644 --- a/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.h +++ b/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(); diff --git a/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp b/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp index b2daa5ce..182a92f0 100644 --- a/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp +++ b/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() { /*---------------------------------------------------------*\ diff --git a/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.h b/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.h index 724bcea4..d08ee85c 100644 --- a/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.h +++ b/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(); diff --git a/Controllers/HoltekController/HoltekA070Controller.cpp b/Controllers/HoltekController/HoltekA070Controller.cpp index 9c91364c..51542888 100644 --- a/Controllers/HoltekController/HoltekA070Controller.cpp +++ b/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); diff --git a/Controllers/HoltekController/HoltekA1FAController.cpp b/Controllers/HoltekController/HoltekA1FAController.cpp index c2f820f5..0f4089bd 100644 --- a/Controllers/HoltekController/HoltekA1FAController.cpp +++ b/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); diff --git a/Controllers/HoltekController/RGBController_HoltekA070.cpp b/Controllers/HoltekController/RGBController_HoltekA070.cpp index 1d3f54ae..d26b0d0f 100644 --- a/Controllers/HoltekController/RGBController_HoltekA070.cpp +++ b/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; diff --git a/Controllers/HoltekController/RGBController_HoltekA070.h b/Controllers/HoltekController/RGBController_HoltekA070.h index b8cf2b5a..0c6e42fb 100644 --- a/Controllers/HoltekController/RGBController_HoltekA070.h +++ b/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); diff --git a/Controllers/HoltekController/RGBController_HoltekA1FA.cpp b/Controllers/HoltekController/RGBController_HoltekA1FA.cpp index a70aa379..0753309b 100644 --- a/Controllers/HoltekController/RGBController_HoltekA1FA.cpp +++ b/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; diff --git a/Controllers/HoltekController/RGBController_HoltekA1FA.h b/Controllers/HoltekController/RGBController_HoltekA1FA.h index a579ad32..18d10dd9 100644 --- a/Controllers/HoltekController/RGBController_HoltekA1FA.h +++ b/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 */ diff --git a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp index d2acd4fd..74878a96 100644 --- a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp +++ b/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++) diff --git a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.h b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.h index 92a8b2eb..004125fc 100644 --- a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.h +++ b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.h @@ -16,6 +16,7 @@ class RGBController_HyperXDRAM : public RGBController { public: RGBController_HyperXDRAM(HyperXDRAMController* hyperx_ptr); + ~RGBController_HyperXDRAM(); void SetupZones(); diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp index 2d0705f4..f020e90d 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController.cpp @@ -22,7 +22,7 @@ HyperXAlloyOriginsController::HyperXAlloyOriginsController(hid_device* dev_handl HyperXAlloyOriginsController::~HyperXAlloyOriginsController() { - + hid_close(dev); } std::string HyperXAlloyOriginsController::GetDeviceLocation() diff --git a/Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp b/Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp index 7dac20d6..0647ac3c 100644 --- a/Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp +++ b/Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp @@ -35,7 +35,7 @@ HyperXKeyboardController::HyperXKeyboardController(hid_device* dev_handle, const HyperXKeyboardController::~HyperXKeyboardController() { - + hid_close(dev); } std::string HyperXKeyboardController::GetDeviceLocation() diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp index f17c6092..7a6cff98 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp +++ b/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() diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp index 43e6f065..1b138f1e 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXKeyboard.cpp +++ b/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() diff --git a/Controllers/HyperXMouseController/HyperXPulsefireFPSProController.cpp b/Controllers/HyperXMouseController/HyperXPulsefireFPSProController.cpp index 0244596d..8ad757fa 100644 --- a/Controllers/HyperXMouseController/HyperXPulsefireFPSProController.cpp +++ b/Controllers/HyperXMouseController/HyperXPulsefireFPSProController.cpp @@ -19,7 +19,7 @@ HyperXPulsefireFPSProController::HyperXPulsefireFPSProController(hid_device* dev HyperXPulsefireFPSProController::~HyperXPulsefireFPSProController() { - + hid_close(dev); } std::string HyperXPulsefireFPSProController::GetDeviceLocation() diff --git a/Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp b/Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp index e50bead2..b3f8967c 100644 --- a/Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp +++ b/Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp @@ -19,7 +19,7 @@ HyperXPulsefireSurgeController::HyperXPulsefireSurgeController(hid_device* dev_h HyperXPulsefireSurgeController::~HyperXPulsefireSurgeController() { - + hid_close(dev); } std::string HyperXPulsefireSurgeController::GetDeviceLocation() diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp index 13049d81..f111a51d 100644 --- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp +++ b/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() diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp index 953c4dcb..8da04e89 100644 --- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp +++ b/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() diff --git a/Controllers/HyperXMousematController/HyperXMousematController.cpp b/Controllers/HyperXMousematController/HyperXMousematController.cpp index fa38b8b2..755d56a0 100644 --- a/Controllers/HyperXMousematController/HyperXMousematController.cpp +++ b/Controllers/HyperXMousematController/HyperXMousematController.cpp @@ -19,7 +19,7 @@ HyperXMousematController::HyperXMousematController(hid_device* dev_handle, const HyperXMousematController::~HyperXMousematController() { - + hid_close(dev); } std::string HyperXMousematController::GetDeviceLocation() diff --git a/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp b/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp index 6480006b..2901bfc6 100644 --- a/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp +++ b/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() diff --git a/Controllers/LEDStripController/RGBController_LEDStrip.cpp b/Controllers/LEDStripController/RGBController_LEDStrip.cpp index 69b1fad1..3bed253d 100644 --- a/Controllers/LEDStripController/RGBController_LEDStrip.cpp +++ b/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; diff --git a/Controllers/LEDStripController/RGBController_LEDStrip.h b/Controllers/LEDStripController/RGBController_LEDStrip.h index 8227b994..662b788f 100644 --- a/Controllers/LEDStripController/RGBController_LEDStrip.h +++ b/Controllers/LEDStripController/RGBController_LEDStrip.h @@ -16,6 +16,7 @@ class RGBController_LEDStrip : public RGBController { public: RGBController_LEDStrip(LEDStripController* ledstrip_ptr); + ~RGBController_LEDStrip(); void SetupZones(); diff --git a/Controllers/LinuxLEDController/RGBController_LinuxLED.cpp b/Controllers/LinuxLEDController/RGBController_LinuxLED.cpp index 0826380e..bc3f7e7f 100644 --- a/Controllers/LinuxLEDController/RGBController_LinuxLED.cpp +++ b/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; diff --git a/Controllers/LinuxLEDController/RGBController_LinuxLED.h b/Controllers/LinuxLEDController/RGBController_LinuxLED.h index 557f8631..54813bca 100644 --- a/Controllers/LinuxLEDController/RGBController_LinuxLED.h +++ b/Controllers/LinuxLEDController/RGBController_LinuxLED.h @@ -14,6 +14,7 @@ class RGBController_LinuxLED : public RGBController { public: RGBController_LinuxLED(LinuxLEDController* controller_ptr); + ~RGBController_LinuxLED(); void SetupZones(); diff --git a/Controllers/LogitechController/LogitechControllerDetect.cpp b/Controllers/LogitechController/LogitechControllerDetect.cpp index c96a4d89..c0c50706 100644 --- a/Controllers/LogitechController/LogitechControllerDetect.cpp +++ b/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); diff --git a/Controllers/LogitechController/LogitechG203Controller.cpp b/Controllers/LogitechController/LogitechG203Controller.cpp index 3ea57b2d..341f10cf 100644 --- a/Controllers/LogitechController/LogitechG203Controller.cpp +++ b/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); diff --git a/Controllers/LogitechController/LogitechG203LController.cpp b/Controllers/LogitechController/LogitechG203LController.cpp index ce88fbaf..3d7720d0 100644 --- a/Controllers/LogitechController/LogitechG203LController.cpp +++ b/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); diff --git a/Controllers/LogitechController/LogitechG810Controller.cpp b/Controllers/LogitechController/LogitechG810Controller.cpp index 501ecbf1..9abdc3ea 100644 --- a/Controllers/LogitechController/LogitechG810Controller.cpp +++ b/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() diff --git a/Controllers/LogitechController/RGBController_LogitechG203.cpp b/Controllers/LogitechController/RGBController_LogitechG203.cpp index 50827848..fec6b448 100644 --- a/Controllers/LogitechController/RGBController_LogitechG203.cpp +++ b/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; diff --git a/Controllers/LogitechController/RGBController_LogitechG203.h b/Controllers/LogitechController/RGBController_LogitechG203.h index b4aa001c..7b888779 100644 --- a/Controllers/LogitechController/RGBController_LogitechG203.h +++ b/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; -}; \ No newline at end of file +}; diff --git a/Controllers/LogitechController/RGBController_LogitechG203L.cpp b/Controllers/LogitechController/RGBController_LogitechG203L.cpp index 9cfc88ba..61080a9f 100644 --- a/Controllers/LogitechController/RGBController_LogitechG203L.cpp +++ b/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; diff --git a/Controllers/LogitechController/RGBController_LogitechG203L.h b/Controllers/LogitechController/RGBController_LogitechG203L.h index e4d7934d..b91c8af1 100644 --- a/Controllers/LogitechController/RGBController_LogitechG203L.h +++ b/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; -}; \ No newline at end of file +}; diff --git a/Controllers/LogitechController/RGBController_LogitechG213.cpp b/Controllers/LogitechController/RGBController_LogitechG213.cpp index fe6b36f1..8cfd28da 100644 --- a/Controllers/LogitechController/RGBController_LogitechG213.cpp +++ b/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() diff --git a/Controllers/LogitechController/RGBController_LogitechG403.cpp b/Controllers/LogitechController/RGBController_LogitechG403.cpp index d7ffb3ef..f4a323d1 100644 --- a/Controllers/LogitechController/RGBController_LogitechG403.cpp +++ b/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; diff --git a/Controllers/LogitechController/RGBController_LogitechG403.h b/Controllers/LogitechController/RGBController_LogitechG403.h index 04f79d76..c236aef0 100644 --- a/Controllers/LogitechController/RGBController_LogitechG403.h +++ b/Controllers/LogitechController/RGBController_LogitechG403.h @@ -15,6 +15,7 @@ class RGBController_LogitechG403 : public RGBController { public: RGBController_LogitechG403(LogitechG403Controller* logitech_ptr); + ~RGBController_LogitechG403(); void SetupZones(); diff --git a/Controllers/LogitechController/RGBController_LogitechG502PS.cpp b/Controllers/LogitechController/RGBController_LogitechG502PS.cpp index c8104082..3b2dfa0a 100644 --- a/Controllers/LogitechController/RGBController_LogitechG502PS.cpp +++ b/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; diff --git a/Controllers/LogitechController/RGBController_LogitechG502PS.h b/Controllers/LogitechController/RGBController_LogitechG502PS.h index 807fe48f..bf023433 100644 --- a/Controllers/LogitechController/RGBController_LogitechG502PS.h +++ b/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; -}; \ No newline at end of file +}; diff --git a/Controllers/LogitechController/RGBController_LogitechG810.cpp b/Controllers/LogitechController/RGBController_LogitechG810.cpp index 1c4ef084..bbc6b5f4 100644 --- a/Controllers/LogitechController/RGBController_LogitechG810.cpp +++ b/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() diff --git a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp index 37e17e2e..4f32603d 100644 --- a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp +++ b/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; diff --git a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.h b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.h index c60d8713..1e225eb7 100644 --- a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.h +++ b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.h @@ -15,6 +15,7 @@ class RGBController_LogitechGPowerPlay : public RGBController { public: RGBController_LogitechGPowerPlay(LogitechGPowerPlayController* logitech_ptr); + ~RGBController_LogitechGPowerPlay(); void SetupZones(); diff --git a/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp b/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp index ad0e6abc..84254ad7 100644 --- a/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp +++ b/Controllers/LogitechController/RGBController_LogitechGProWireless.cpp @@ -57,6 +57,11 @@ RGBController_LogitechGProWireless::RGBController_LogitechGProWireless(LogitechG SetupZones(); } +RGBController_LogitechGProWireless::~RGBController_LogitechGProWireless() +{ + delete logitech; +} + void RGBController_LogitechGProWireless::SetupZones() { zone GProWireless_primary_zone; diff --git a/Controllers/LogitechController/RGBController_LogitechGProWireless.h b/Controllers/LogitechController/RGBController_LogitechGProWireless.h index 6ac6e2f6..14b41e01 100644 --- a/Controllers/LogitechController/RGBController_LogitechGProWireless.h +++ b/Controllers/LogitechController/RGBController_LogitechGProWireless.h @@ -15,6 +15,7 @@ class RGBController_LogitechGProWireless : public RGBController { public: RGBController_LogitechGProWireless(LogitechGProWirelessController* logitech_ptr); + ~RGBController_LogitechGProWireless(); void SetupZones(); diff --git a/Controllers/MSI3ZoneController/MSI3ZoneController.cpp b/Controllers/MSI3ZoneController/MSI3ZoneController.cpp index f3d665a1..1fd1c0fe 100644 --- a/Controllers/MSI3ZoneController/MSI3ZoneController.cpp +++ b/Controllers/MSI3ZoneController/MSI3ZoneController.cpp @@ -19,7 +19,7 @@ MSI3ZoneController::MSI3ZoneController(hid_device* dev_handle, const char* path) MSI3ZoneController::~MSI3ZoneController() { - + hid_close(dev); } char* MSI3ZoneController::GetDeviceName() diff --git a/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp b/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp index e2f0e98d..73801c2b 100644 --- a/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp +++ b/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp @@ -32,7 +32,7 @@ RGBController_MSI3Zone::RGBController_MSI3Zone(MSI3ZoneController* msi_ptr) RGBController_MSI3Zone::~RGBController_MSI3Zone() { - + delete msi; } void RGBController_MSI3Zone::SetupZones() diff --git a/Controllers/MSIGPUController/RGBController_MSIGPU.cpp b/Controllers/MSIGPUController/RGBController_MSIGPU.cpp index 0e20e395..993d6dd3 100644 --- a/Controllers/MSIGPUController/RGBController_MSIGPU.cpp +++ b/Controllers/MSIGPUController/RGBController_MSIGPU.cpp @@ -217,6 +217,11 @@ RGBController_MSIGPU::RGBController_MSIGPU(MSIGPUController * msi_gpu_ptr) active_mode = GetDeviceMode(); } +RGBController_MSIGPU::~RGBController_MSIGPU() +{ + delete msi_gpu; +} + void RGBController_MSIGPU::SetupZones() { /*---------------------------------------------------------*\ diff --git a/Controllers/MSIGPUController/RGBController_MSIGPU.h b/Controllers/MSIGPUController/RGBController_MSIGPU.h index 669d8781..36add91b 100644 --- a/Controllers/MSIGPUController/RGBController_MSIGPU.h +++ b/Controllers/MSIGPUController/RGBController_MSIGPU.h @@ -14,6 +14,7 @@ class RGBController_MSIGPU : public RGBController { public: RGBController_MSIGPU(MSIGPUController* msi_gpu_ptr); + ~RGBController_MSIGPU(); void SetupZones(); diff --git a/Controllers/MSIMysticLightController/MSIMysticLightController.cpp b/Controllers/MSIMysticLightController/MSIMysticLightController.cpp index 03cf4ea3..fd0d534e 100644 --- a/Controllers/MSIMysticLightController/MSIMysticLightController.cpp +++ b/Controllers/MSIMysticLightController/MSIMysticLightController.cpp @@ -29,10 +29,7 @@ MSIMysticLightController::MSIMysticLightController(hid_device* handle, const cha MSIMysticLightController::~MSIMysticLightController() { - if(dev) - { - hid_close(dev); - } + hid_close(dev); } unsigned int MSIMysticLightController::GetZoneMinLedCount diff --git a/Controllers/MSIRGBController/RGBController_MSIRGB.cpp b/Controllers/MSIRGBController/RGBController_MSIRGB.cpp index dda82fb5..e3de1e6b 100644 --- a/Controllers/MSIRGBController/RGBController_MSIRGB.cpp +++ b/Controllers/MSIRGBController/RGBController_MSIRGB.cpp @@ -29,7 +29,7 @@ RGBController_MSIRGB::RGBController_MSIRGB(MSIRGBController* msi_ptr) RGBController_MSIRGB::~RGBController_MSIRGB() { - + delete msi; } void RGBController_MSIRGB::SetupZones() diff --git a/Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp b/Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp index e529d093..a6f11b0f 100644 --- a/Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp +++ b/Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp @@ -29,7 +29,7 @@ NZXTHue2Controller::NZXTHue2Controller(hid_device* dev_handle, unsigned int rgb_ NZXTHue2Controller::~NZXTHue2Controller() { - + hid_close(dev); } unsigned char NZXTHue2Controller::GetFanCommand diff --git a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp index 4a168303..ab272f78 100644 --- a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp +++ b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp @@ -133,6 +133,11 @@ RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* hue2_ptr) SetupZones(); } +RGBController_NZXTHue2::~RGBController_NZXTHue2() +{ + delete hue2; +} + void RGBController_NZXTHue2::SetupZones() { /*-------------------------------------------------*\ diff --git a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h index 14c9e1b6..a3e4201c 100644 --- a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h +++ b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h @@ -14,6 +14,7 @@ class RGBController_NZXTHue2 : public RGBController { public: RGBController_NZXTHue2(NZXTHue2Controller* hue2_ptr); + ~RGBController_NZXTHue2(); void SetupZones(); diff --git a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp index b519139f..f25215b5 100644 --- a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp +++ b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp @@ -161,6 +161,11 @@ RGBController_HuePlus::RGBController_HuePlus(HuePlusController* hueplus_ptr) SetupZones(); } +RGBController_HuePlus::~RGBController_HuePlus() +{ + delete hueplus; +} + void RGBController_HuePlus::SetupZones() { /*-------------------------------------------------*\ diff --git a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h index 7b99f064..b6b67489 100644 --- a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h +++ b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h @@ -15,6 +15,7 @@ class RGBController_HuePlus : public RGBController { public: RGBController_HuePlus(HuePlusController* hueplus_ptr); + ~RGBController_HuePlus(); void SetupZones(); diff --git a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp index fdfb9337..0e6eae8d 100644 --- a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp +++ b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp @@ -188,6 +188,11 @@ RGBController_NZXTKraken::RGBController_NZXTKraken(NZXTKrakenController* nzxtkra SetupZones(); } +RGBController_NZXTKraken::~RGBController_NZXTKraken() +{ + delete nzxtkraken; +} + void RGBController_NZXTKraken::SetupZones() { /*---------------------------------------------------------*\ diff --git a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.h b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.h index 0f03cb71..87da89dc 100644 --- a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.h +++ b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.h @@ -16,6 +16,7 @@ class RGBController_NZXTKraken : public RGBController { public: RGBController_NZXTKraken(NZXTKrakenController* nzxtkraken_ptr); + ~RGBController_NZXTKraken(); void SetupZones(); diff --git a/Controllers/PatriotViperController/RGBController_PatriotViper.cpp b/Controllers/PatriotViperController/RGBController_PatriotViper.cpp index 2ca2174b..1819d053 100644 --- a/Controllers/PatriotViperController/RGBController_PatriotViper.cpp +++ b/Controllers/PatriotViperController/RGBController_PatriotViper.cpp @@ -102,6 +102,11 @@ RGBController_PatriotViper::RGBController_PatriotViper(PatriotViperController* v SetupZones(); } +RGBController_PatriotViper::~RGBController_PatriotViper() +{ + delete viper; +} + void RGBController_PatriotViper::SetupZones() { /*---------------------------------------------------------*\ diff --git a/Controllers/PatriotViperController/RGBController_PatriotViper.h b/Controllers/PatriotViperController/RGBController_PatriotViper.h index 2b2fdd78..2c9f62dd 100644 --- a/Controllers/PatriotViperController/RGBController_PatriotViper.h +++ b/Controllers/PatriotViperController/RGBController_PatriotViper.h @@ -16,6 +16,7 @@ class RGBController_PatriotViper : public RGBController { public: RGBController_PatriotViper(PatriotViperController* viper_ptr); + ~RGBController_PatriotViper(); void SetupZones(); diff --git a/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp b/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp index e3a4ba78..0c236f3e 100644 --- a/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp +++ b/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp @@ -30,6 +30,11 @@ RGBController_PhilipsWiz::RGBController_PhilipsWiz(PhilipsWizController* light_p SetupZones(); } +RGBController_PhilipsWiz::~RGBController_PhilipsWiz() +{ + delete light; +} + void RGBController_PhilipsWiz::SetupZones() { zone led_zone; diff --git a/Controllers/PhilipsWizController/RGBController_PhilipsWiz.h b/Controllers/PhilipsWizController/RGBController_PhilipsWiz.h index 17ca391d..66a06e58 100644 --- a/Controllers/PhilipsWizController/RGBController_PhilipsWiz.h +++ b/Controllers/PhilipsWizController/RGBController_PhilipsWiz.h @@ -14,6 +14,7 @@ class RGBController_PhilipsWiz : public RGBController { public: RGBController_PhilipsWiz(PhilipsWizController* light_ptr); + ~RGBController_PhilipsWiz(); void SetupZones(); diff --git a/Controllers/RazerController/RGBController_Razer.cpp b/Controllers/RazerController/RGBController_Razer.cpp index 8c629c4a..f6449081 100644 --- a/Controllers/RazerController/RGBController_Razer.cpp +++ b/Controllers/RazerController/RGBController_Razer.cpp @@ -79,7 +79,7 @@ RGBController_Razer::RGBController_Razer(RazerController* controller_ptr) RGBController_Razer::~RGBController_Razer() { - + delete controller; } void RGBController_Razer::SetupZones() diff --git a/Controllers/RazerController/RazerController.cpp b/Controllers/RazerController/RazerController.cpp index 69dd5d69..b7daef23 100644 --- a/Controllers/RazerController/RazerController.cpp +++ b/Controllers/RazerController/RazerController.cpp @@ -111,7 +111,7 @@ RazerController::RazerController(hid_device* dev_handle, const char* path, unsig RazerController::~RazerController() { - + hid_close(dev); } std::string RazerController::GetName() diff --git a/Controllers/RedragonController/RGBController_RedragonK556.cpp b/Controllers/RedragonController/RGBController_RedragonK556.cpp index 254e2940..91dccc4a 100644 --- a/Controllers/RedragonController/RGBController_RedragonK556.cpp +++ b/Controllers/RedragonController/RGBController_RedragonK556.cpp @@ -220,6 +220,8 @@ RGBController_RedragonK556::~RGBController_RedragonK556() delete zones[zone_index].matrix_map; } } + + delete redragon; } void RGBController_RedragonK556::SetupZones() diff --git a/Controllers/RedragonController/RGBController_RedragonM711.cpp b/Controllers/RedragonController/RGBController_RedragonM711.cpp index e4b56b84..b0ec210c 100644 --- a/Controllers/RedragonController/RGBController_RedragonM711.cpp +++ b/Controllers/RedragonController/RGBController_RedragonM711.cpp @@ -58,6 +58,11 @@ RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* r SetupZones(); } +RGBController_RedragonM711::~RGBController_RedragonM711() +{ + delete redragon; +} + void RGBController_RedragonM711::SetupZones() { zone m711_zone; diff --git a/Controllers/RedragonController/RGBController_RedragonM711.h b/Controllers/RedragonController/RGBController_RedragonM711.h index 894df563..783e9a36 100644 --- a/Controllers/RedragonController/RGBController_RedragonM711.h +++ b/Controllers/RedragonController/RGBController_RedragonM711.h @@ -15,6 +15,7 @@ class RGBController_RedragonM711 : public RGBController { public: RGBController_RedragonM711(RedragonM711Controller* redragon_ptr); + ~RGBController_RedragonM711(); void SetupZones(); @@ -29,4 +30,4 @@ public: private: RedragonM711Controller* redragon; -}; \ No newline at end of file +}; diff --git a/Controllers/RedragonController/RedragonK556Controller.cpp b/Controllers/RedragonController/RedragonK556Controller.cpp index e9cc8c72..8adc386f 100644 --- a/Controllers/RedragonController/RedragonK556Controller.cpp +++ b/Controllers/RedragonController/RedragonK556Controller.cpp @@ -8,6 +8,11 @@ RedragonK556Controller::RedragonK556Controller(hid_device* dev_handle, const cha location = path; } +RedragonK556Controller::~RedragonK556Controller() +{ + hid_close(dev); +} + std::string RedragonK556Controller::GetDeviceLocation() { return("HID: " + location); diff --git a/Controllers/RedragonController/RedragonM711Controller.cpp b/Controllers/RedragonController/RedragonM711Controller.cpp index aded1b72..1d9da31e 100644 --- a/Controllers/RedragonController/RedragonM711Controller.cpp +++ b/Controllers/RedragonController/RedragonM711Controller.cpp @@ -13,6 +13,11 @@ RedragonM711Controller::RedragonM711Controller(hid_device* dev_handle, const cha SendMouseApply(); } +RedragonM711Controller::~RedragonM711Controller() +{ + hid_close(dev); +} + std::string RedragonM711Controller::GetDeviceLocation() { return("HID: " + location); diff --git a/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp b/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp index c83aa9d2..34c15e04 100644 --- a/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp +++ b/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp @@ -35,6 +35,11 @@ RGBController_RoccatKoneAimo::RGBController_RoccatKoneAimo(RoccatKoneAimoControl } +RGBController_RoccatKoneAimo::~RGBController_RoccatKoneAimo() +{ + delete mouse; +} + void RGBController_RoccatKoneAimo::SetupZones() { /*---------------------------------------------------------*\ diff --git a/Controllers/RoccatController/RGBController_RoccatKoneAimo.h b/Controllers/RoccatController/RGBController_RoccatKoneAimo.h index 1612bb2d..e9838109 100644 --- a/Controllers/RoccatController/RGBController_RoccatKoneAimo.h +++ b/Controllers/RoccatController/RGBController_RoccatKoneAimo.h @@ -15,6 +15,7 @@ class RGBController_RoccatKoneAimo : public RGBController { public: RGBController_RoccatKoneAimo(RoccatKoneAimoController* mouse_ptr); + ~RGBController_RoccatKoneAimo(); void SetupZones(); @@ -31,4 +32,4 @@ private: RoccatKoneAimoController* mouse; std::vector zones_channel; std::vector leds_channel; -}; \ No newline at end of file +}; diff --git a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.cpp b/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.cpp index 36eb0a2a..0daf0939 100644 --- a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.cpp +++ b/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.cpp @@ -40,6 +40,11 @@ RGBController_SapphireNitroGlowV1::RGBController_SapphireNitroGlowV1(SapphireNit active_mode = 0; } +RGBController_SapphireNitroGlowV1::~RGBController_SapphireNitroGlowV1() +{ + delete sapphire; +} + void RGBController_SapphireNitroGlowV1::SetupZones() { /*---------------------------------------------------------*\ @@ -102,4 +107,4 @@ void RGBController_SapphireNitroGlowV1::SetCustomMode() void RGBController_SapphireNitroGlowV1::DeviceUpdateMode() { sapphire->SetMode((unsigned char)modes[(unsigned int)active_mode].value, (unsigned char)modes[(unsigned int)active_mode].speed); -} \ No newline at end of file +} diff --git a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.h b/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.h index 5cf48b86..a6355417 100644 --- a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.h +++ b/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.h @@ -16,6 +16,7 @@ class RGBController_SapphireNitroGlowV1 : public RGBController { public: RGBController_SapphireNitroGlowV1(SapphireNitroGlowV1Controller* sapphire_ptr); + ~RGBController_SapphireNitroGlowV1(); void SetupZones(); @@ -30,4 +31,4 @@ public: private: SapphireNitroGlowV1Controller* sapphire; -}; \ No newline at end of file +}; diff --git a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.cpp b/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.cpp index ef1e31fc..7a0d15ab 100644 --- a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.cpp +++ b/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.cpp @@ -75,6 +75,11 @@ RGBController_SapphireNitroGlowV3::RGBController_SapphireNitroGlowV3(SapphireNit active_mode = 0; } +RGBController_SapphireNitroGlowV3::~RGBController_SapphireNitroGlowV3() +{ + delete sapphire; +} + void RGBController_SapphireNitroGlowV3::SetupZones() { /*---------------------------------------------------------*\ @@ -137,4 +142,4 @@ void RGBController_SapphireNitroGlowV3::SetCustomMode() void RGBController_SapphireNitroGlowV3::DeviceUpdateMode() { sapphire->SetMode((unsigned char)modes[(unsigned int)active_mode].value, (unsigned char)modes[(unsigned int)active_mode].speed); -} \ No newline at end of file +} diff --git a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.h b/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.h index 8c474d17..f1e9d390 100644 --- a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.h +++ b/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.h @@ -16,6 +16,7 @@ class RGBController_SapphireNitroGlowV3 : public RGBController { public: RGBController_SapphireNitroGlowV3(SapphireNitroGlowV3Controller* sapphire_ptr); + ~RGBController_SapphireNitroGlowV3(); void SetupZones(); @@ -30,4 +31,4 @@ public: private: SapphireNitroGlowV3Controller* sapphire; -}; \ No newline at end of file +}; diff --git a/Controllers/SinowealthController/RGBController_Sinowealth.cpp b/Controllers/SinowealthController/RGBController_Sinowealth.cpp index e63262ba..13643b27 100644 --- a/Controllers/SinowealthController/RGBController_Sinowealth.cpp +++ b/Controllers/SinowealthController/RGBController_Sinowealth.cpp @@ -123,6 +123,11 @@ RGBController_Sinowealth::RGBController_Sinowealth(SinowealthController* sinowea SetupZones(); } +RGBController_Sinowealth::~RGBController_Sinowealth() +{ + delete sinowealth; +} + void RGBController_Sinowealth::SetupZones() { /*---------------------------------------------------------*\ diff --git a/Controllers/SinowealthController/RGBController_Sinowealth.h b/Controllers/SinowealthController/RGBController_Sinowealth.h index d3a5c2e2..dda688b1 100644 --- a/Controllers/SinowealthController/RGBController_Sinowealth.h +++ b/Controllers/SinowealthController/RGBController_Sinowealth.h @@ -16,6 +16,7 @@ class RGBController_Sinowealth : public RGBController { public: RGBController_Sinowealth(SinowealthController* sinowealth_ptr); + ~RGBController_Sinowealth(); void SetupZones(); diff --git a/Controllers/SinowealthController/SinowealthController.cpp b/Controllers/SinowealthController/SinowealthController.cpp index be074628..562d925f 100644 --- a/Controllers/SinowealthController/SinowealthController.cpp +++ b/Controllers/SinowealthController/SinowealthController.cpp @@ -26,7 +26,8 @@ SinowealthController::SinowealthController(hid_device* dev_handle_id_4, hid_devi SinowealthController::~SinowealthController() { - + hid_close(dev_report_id_4); + hid_close(dev_report_id_5); } std::string SinowealthController::GetLocation() diff --git a/Controllers/SonyDS4Controller/RGBController_SonyDS4.cpp b/Controllers/SonyDS4Controller/RGBController_SonyDS4.cpp index a6e8b603..c543accb 100644 --- a/Controllers/SonyDS4Controller/RGBController_SonyDS4.cpp +++ b/Controllers/SonyDS4Controller/RGBController_SonyDS4.cpp @@ -31,6 +31,11 @@ RGBController_SonyDS4::RGBController_SonyDS4(SonyDS4Controller* dualshock) SetupZones(); } +RGBController_SonyDS4::~RGBController_SonyDS4() +{ + delete dualshock; +} + void RGBController_SonyDS4::SetupZones() { /*---------------------------------------------------------*\ diff --git a/Controllers/SonyDS4Controller/RGBController_SonyDS4.h b/Controllers/SonyDS4Controller/RGBController_SonyDS4.h index 0fd52841..f4587573 100644 --- a/Controllers/SonyDS4Controller/RGBController_SonyDS4.h +++ b/Controllers/SonyDS4Controller/RGBController_SonyDS4.h @@ -13,7 +13,8 @@ class RGBController_SonyDS4 : public RGBController { public: RGBController_SonyDS4(SonyDS4Controller* dualshock); - + ~RGBController_SonyDS4(); + void SetupZones(); void ResizeZone(int zone, int new_size); diff --git a/Controllers/SonyDS4Controller/SonyDS4Controller.cpp b/Controllers/SonyDS4Controller/SonyDS4Controller.cpp index fc668cfb..7f67b123 100644 --- a/Controllers/SonyDS4Controller/SonyDS4Controller.cpp +++ b/Controllers/SonyDS4Controller/SonyDS4Controller.cpp @@ -31,6 +31,11 @@ SonyDS4Controller::SonyDS4Controller(hid_device * device_handle, const char * de location = device_path; } +SonyDS4Controller::~SonyDS4Controller() +{ + hid_close(device_handle); +} + std::string SonyDS4Controller::GetLocation() { return("HID: " + location); diff --git a/Controllers/SonyDS4Controller/SonyDS4Controller.h b/Controllers/SonyDS4Controller/SonyDS4Controller.h index 6e4983df..838bfb1a 100644 --- a/Controllers/SonyDS4Controller/SonyDS4Controller.h +++ b/Controllers/SonyDS4Controller/SonyDS4Controller.h @@ -14,7 +14,8 @@ class SonyDS4Controller { public: SonyDS4Controller(hid_device * device_handle, const char * device_path); - + ~SonyDS4Controller(); + std::string GetLocation(); std::string GetSerialString(); diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp index 1d1fd34b..4e5c3c4e 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp @@ -289,6 +289,8 @@ RGBController_SteelSeriesApex::~RGBController_SteelSeriesApex() delete zones[zone_index].matrix_map; } } + + delete steelseries; } void RGBController_SteelSeriesApex::SetupZones() diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp index 605f53c4..ec5c3af5 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp @@ -88,6 +88,11 @@ RGBController_SteelSeriesOldApex::RGBController_SteelSeriesOldApex(SteelSeriesOl SetupZones(); } +RGBController_SteelSeriesOldApex::~RGBController_SteelSeriesOldApex() +{ + delete OldApex; +} + void RGBController_SteelSeriesOldApex::SetupZones() { /* We have 5 zones to work with. Here goes... */ diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.h b/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.h index b9eb8f69..94da6688 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.h +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.h @@ -26,6 +26,7 @@ class RGBController_SteelSeriesOldApex : public RGBController { public: RGBController_SteelSeriesOldApex(SteelSeriesOldApexController* old_apex_ptr); + ~RGBController_SteelSeriesOldApex(); void SetupZones(); diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp index 3966f792..c417e063 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp @@ -40,6 +40,11 @@ RGBController_SteelSeriesRival::RGBController_SteelSeriesRival(SteelSeriesRivalC SetupZones(); } +RGBController_SteelSeriesRival::~RGBController_SteelSeriesRival() +{ + delete rival; +} + void RGBController_SteelSeriesRival::SetupZones() { /* Rival 100 Series only has one Zone */ diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.h b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.h index 395e2766..2ba2ea53 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.h +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.h @@ -16,6 +16,7 @@ class RGBController_SteelSeriesRival : public RGBController { public: RGBController_SteelSeriesRival(SteelSeriesRivalController* rival_ptr); + ~RGBController_SteelSeriesRival(); void SetupZones(); diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp index c1d41c79..7b5f4834 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp @@ -29,6 +29,11 @@ RGBController_SteelSeriesSiberia::RGBController_SteelSeriesSiberia(SteelSeriesSi SetupZones(); } +RGBController_SteelSeriesSiberia::~RGBController_SteelSeriesSiberia() +{ + delete siberia; +} + void RGBController_SteelSeriesSiberia::SetupZones() { /* Siberia 350 only has one Zone */ diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.h b/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.h index e1bba4b3..78e2411b 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.h +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.h @@ -16,6 +16,7 @@ class RGBController_SteelSeriesSiberia : public RGBController { public: RGBController_SteelSeriesSiberia(SteelSeriesSiberiaController* siberia_ptr); + ~RGBController_SteelSeriesSiberia(); void SetupZones(); diff --git a/Controllers/SteelSeriesController/SteelSeriesApexBaseController.h b/Controllers/SteelSeriesController/SteelSeriesApexBaseController.h index 880f5d9f..71a2d435 100644 --- a/Controllers/SteelSeriesController/SteelSeriesApexBaseController.h +++ b/Controllers/SteelSeriesController/SteelSeriesApexBaseController.h @@ -18,6 +18,11 @@ class SteelSeriesApexBaseController { public: + virtual ~SteelSeriesApexBaseController() + { + + } + std::string GetDeviceLocation() { return("HID: " + location); diff --git a/Controllers/SteelSeriesController/SteelSeriesApexController.cpp b/Controllers/SteelSeriesController/SteelSeriesApexController.cpp index 13353108..2e928a0c 100644 --- a/Controllers/SteelSeriesController/SteelSeriesApexController.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesApexController.cpp @@ -40,7 +40,7 @@ SteelSeriesApexController::SteelSeriesApexController(hid_device* dev_handle, ste SteelSeriesApexController::~SteelSeriesApexController() { - + hid_close(dev); } void SteelSeriesApexController::SetMode diff --git a/Controllers/SteelSeriesController/SteelSeriesApexMController.cpp b/Controllers/SteelSeriesController/SteelSeriesApexMController.cpp index ef7008a1..93f06789 100644 --- a/Controllers/SteelSeriesController/SteelSeriesApexMController.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesApexMController.cpp @@ -29,7 +29,7 @@ SteelSeriesApexMController::SteelSeriesApexMController(hid_device* dev_handle, s SteelSeriesApexMController::~SteelSeriesApexMController() { - + hid_close(dev); } void SteelSeriesApexMController::EnableLEDControl() diff --git a/Controllers/SteelSeriesController/SteelSeriesOldApexController.cpp b/Controllers/SteelSeriesController/SteelSeriesOldApexController.cpp index 26e90cd9..afcbd999 100644 --- a/Controllers/SteelSeriesController/SteelSeriesOldApexController.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesOldApexController.cpp @@ -50,7 +50,7 @@ SteelSeriesOldApexController::SteelSeriesOldApexController SteelSeriesOldApexController::~SteelSeriesOldApexController() { - + hid_close(dev); } std::string SteelSeriesOldApexController::GetDeviceLocation() diff --git a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp index 925c8190..b4b6e3af 100644 --- a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp @@ -41,7 +41,7 @@ SteelSeriesRivalController::SteelSeriesRivalController SteelSeriesRivalController::~SteelSeriesRivalController() { - + hid_close(dev); } std::string SteelSeriesRivalController::GetDeviceLocation() diff --git a/Controllers/SteelSeriesController/SteelSeriesSiberiaController.cpp b/Controllers/SteelSeriesController/SteelSeriesSiberiaController.cpp index fb8563ce..49e0ef62 100644 --- a/Controllers/SteelSeriesController/SteelSeriesSiberiaController.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesSiberiaController.cpp @@ -45,6 +45,7 @@ SteelSeriesSiberiaController::SteelSeriesSiberiaController SteelSeriesSiberiaController::~SteelSeriesSiberiaController() { + hid_close(dev); } std::string SteelSeriesSiberiaController::GetDeviceLocation() diff --git a/Controllers/TecknetController/RGBController_Tecknet.cpp b/Controllers/TecknetController/RGBController_Tecknet.cpp index 9a3d450a..8a92f766 100644 --- a/Controllers/TecknetController/RGBController_Tecknet.cpp +++ b/Controllers/TecknetController/RGBController_Tecknet.cpp @@ -55,7 +55,7 @@ RGBController_Tecknet::RGBController_Tecknet(TecknetController *_dev) RGBController_Tecknet::~RGBController_Tecknet() { - + delete Tecknet_dev; } void RGBController_Tecknet::SetupZones() diff --git a/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp b/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp index bf3e6089..31fa8d24 100644 --- a/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp +++ b/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp @@ -208,6 +208,8 @@ RGBController_PoseidonZRGB::~RGBController_PoseidonZRGB() delete zones[zone_index].matrix_map; } } + + delete poseidon; } void RGBController_PoseidonZRGB::SetupZones() diff --git a/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.cpp b/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.cpp index 1137915d..9c7cb340 100644 --- a/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.cpp +++ b/Controllers/ThermaltakePoseidonZRGBController/ThermaltakePoseidonZRGBController.cpp @@ -30,7 +30,7 @@ PoseidonZRGBController::PoseidonZRGBController(hid_device* dev_handle, const cha PoseidonZRGBController::~PoseidonZRGBController() { - + hid_close(dev); } std::string PoseidonZRGBController::GetDeviceLocation() diff --git a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp b/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp index 0f167d20..404b887b 100644 --- a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp +++ b/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp @@ -107,6 +107,11 @@ RGBController_ThermaltakeRiing::RGBController_ThermaltakeRiing(ThermaltakeRiingC SetupZones(); } +RGBController_ThermaltakeRiing::~RGBController_ThermaltakeRiing() +{ + delete riing; +} + void RGBController_ThermaltakeRiing::SetupZones() { /*-------------------------------------------------*\ diff --git a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.h b/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.h index 05f17225..7f8c015e 100644 --- a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.h +++ b/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.h @@ -15,6 +15,7 @@ class RGBController_ThermaltakeRiing : public RGBController { public: RGBController_ThermaltakeRiing(ThermaltakeRiingController* riing_ptr); + ~RGBController_ThermaltakeRiing(); void SetupZones(); diff --git a/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp b/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp index 04107e64..4769e597 100644 --- a/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp +++ b/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp @@ -21,7 +21,7 @@ ThermaltakeRiingController::ThermaltakeRiingController(hid_device* dev_handle, c ThermaltakeRiingController::~ThermaltakeRiingController() { - + hid_close(dev); } std::string ThermaltakeRiingController::GetDeviceLocation() diff --git a/Controllers/YeelightController/RGBController_Yeelight.cpp b/Controllers/YeelightController/RGBController_Yeelight.cpp index ced9d1a1..06be17d7 100644 --- a/Controllers/YeelightController/RGBController_Yeelight.cpp +++ b/Controllers/YeelightController/RGBController_Yeelight.cpp @@ -35,6 +35,11 @@ RGBController_Yeelight::RGBController_Yeelight(YeelightController* light_ptr) SetupZones(); } +RGBController_Yeelight::~RGBController_Yeelight() +{ + delete light; +} + void RGBController_Yeelight::SetupZones() { zone led_zone; diff --git a/Controllers/YeelightController/RGBController_Yeelight.h b/Controllers/YeelightController/RGBController_Yeelight.h index 04b8502d..9af051d8 100644 --- a/Controllers/YeelightController/RGBController_Yeelight.h +++ b/Controllers/YeelightController/RGBController_Yeelight.h @@ -14,6 +14,7 @@ class RGBController_Yeelight : public RGBController { public: RGBController_Yeelight(YeelightController* light_ptr); + ~RGBController_Yeelight(); void SetupZones(); diff --git a/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp b/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp index c3562527..ae9a5bb2 100644 --- a/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp +++ b/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp @@ -167,6 +167,11 @@ RGBController_ZalmanZSync::RGBController_ZalmanZSync(ZalmanZSyncController* cont SetupZones(); } +RGBController_ZalmanZSync::~RGBController_ZalmanZSync() +{ + delete controller; +} + void RGBController_ZalmanZSync::SetupZones() { /*-------------------------------------------------*\ diff --git a/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.h b/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.h index 7e984baa..13c1bbed 100644 --- a/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.h +++ b/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.h @@ -15,6 +15,7 @@ class RGBController_ZalmanZSync : public RGBController { public: RGBController_ZalmanZSync(ZalmanZSyncController* controller_ptr); + ~RGBController_ZalmanZSync(); void SetupZones(); diff --git a/Controllers/ZalmanZSyncController/ZalmanZSyncController.cpp b/Controllers/ZalmanZSyncController/ZalmanZSyncController.cpp index 7d6a22c0..8f92f791 100644 --- a/Controllers/ZalmanZSyncController/ZalmanZSyncController.cpp +++ b/Controllers/ZalmanZSyncController/ZalmanZSyncController.cpp @@ -45,6 +45,8 @@ ZalmanZSyncController::~ZalmanZSyncController() keepalive_thread_run = 0; keepalive_thread->join(); delete keepalive_thread; + + hid_close(dev); } void ZalmanZSyncController::KeepaliveThread() diff --git a/RGBController/RGBController.cpp b/RGBController/RGBController.cpp index f9f003ed..645f0704 100644 --- a/RGBController/RGBController.cpp +++ b/RGBController/RGBController.cpp @@ -14,6 +14,11 @@ RGBController::~RGBController() DeviceThreadRunning = false; DeviceCallThread->join(); delete DeviceCallThread; + + leds.clear(); + colors.clear(); + zones.clear(); + modes.clear(); } unsigned char * RGBController::GetDeviceDescription(unsigned int protocol_version)