Move RGBController base destructor functionality into RGBController::Shutdown() so that update thread can be stopped before deleting the controller. Shutdown() must be called in every RGBController implementation before deleting the controller. Also some fixes to the NetworkServer to avoid deadlocking and disconnect issues

2026-09-15 14:47:14 -04:00 · 2026-03-12 16:42:21 +00:00
1 parent f592b48696
commit ba1b68ee8a
@@ -173,6 +173,8 @@ RGBController_BloodyB820R::RGBController_BloodyB820R(BloodyB820RController *cont

 RGBController_BloodyB820R::~RGBController_BloodyB820R()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -89,6 +89,8 @@ RGBController_BloodyMouse::RGBController_BloodyMouse(BloodyMouseController *cont

 RGBController_BloodyMouse::~RGBController_BloodyMouse()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -44,6 +44,8 @@ RGBController_AMBX::RGBController_AMBX(AMBXController* controller_ptr)

 RGBController_AMBX::~RGBController_AMBX()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -132,6 +132,8 @@ RGBController_AMDWraithPrism::RGBController_AMDWraithPrism(AMDWraithPrismControl

 RGBController_AMDWraithPrism::~RGBController_AMDWraithPrism()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -257,6 +257,8 @@ RGBController_AOCKeyboard::RGBController_AOCKeyboard(AOCKeyboardController* cont

 RGBController_AOCKeyboard::~RGBController_AOCKeyboard()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -123,6 +123,8 @@ RGBController_AOCMouse::RGBController_AOCMouse(AOCMouseController* controller_pt

 RGBController_AOCMouse::~RGBController_AOCMouse()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -113,6 +113,8 @@ RGBController_AOCMousemat::RGBController_AOCMousemat(AOCMousematController* cont

 RGBController_AOCMousemat::~RGBController_AOCMousemat()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -185,6 +185,13 @@ RGBController_PolychromeUSB::RGBController_PolychromeUSB(PolychromeUSBController
    SetupZones();
 }

+RGBController_PolychromeUSB::~RGBController_PolychromeUSB()
+{
+    Shutdown();
+
+    delete controller;
+}
+
 void RGBController_PolychromeUSB::SetupZones()
 {
    /*-------------------------------------------------*\
@@ -19,6 +19,7 @@ class RGBController_PolychromeUSB : public RGBController
 {
 public:
    RGBController_PolychromeUSB(PolychromeUSBController* controller_ptr);
+    ~RGBController_PolychromeUSB();

    void        SetupZones();

@@ -113,6 +113,8 @@ RGBController_ASRockASRRGBSMBus::RGBController_ASRockASRRGBSMBus(ASRockASRRGBSMB

 RGBController_ASRockASRRGBSMBus::~RGBController_ASRockASRRGBSMBus()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -230,6 +230,8 @@ RGBController_ASRockPolychromeV1SMBus::RGBController_ASRockPolychromeV1SMBus(ASR

 RGBController_ASRockPolychromeV1SMBus::~RGBController_ASRockPolychromeV1SMBus()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -185,6 +185,8 @@ RGBController_ASRockPolychromeV2SMBus::RGBController_ASRockPolychromeV2SMBus(ASR

 RGBController_ASRockPolychromeV2SMBus::~RGBController_ASRockPolychromeV2SMBus()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -125,6 +125,13 @@ RGBController_Alienware::RGBController_Alienware(AlienwareController* controller
    controller->UpdateDim();
 }

+RGBController_Alienware::~RGBController_Alienware()
+{
+    Shutdown();
+
+    delete controller;
+}
+
 void RGBController_Alienware::SetupZones()
 {
    /*-------------------------------------------------*\
@@ -19,6 +19,7 @@ class RGBController_Alienware : public RGBController
 {
 public:
    RGBController_Alienware(AlienwareController* controller_ptr);
+    ~RGBController_Alienware();

    void        SetupZones();

@@ -278,6 +278,8 @@ RGBController_AlienwareAW410K::RGBController_AlienwareAW410K(AlienwareAW410KCont

 RGBController_AlienwareAW410K::~RGBController_AlienwareAW410K()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -277,6 +277,8 @@ RGBController_AlienwareAW510K::RGBController_AlienwareAW510K(AlienwareAW510KCont

 RGBController_AlienwareAW510K::~RGBController_AlienwareAW510K()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -46,6 +46,8 @@ RGBController_AlienwareAW3423DWF::RGBController_AlienwareAW3423DWF(AlienwareAW34

 RGBController_AlienwareAW3423DWF::~RGBController_AlienwareAW3423DWF()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -46,6 +46,8 @@ RGBController_AlienwareMonitor::RGBController_AlienwareMonitor(AlienwareMonitorC

 RGBController_AlienwareMonitor::~RGBController_AlienwareMonitor()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -144,6 +144,8 @@ RGBController_AnnePro2::RGBController_AnnePro2(AnnePro2Controller* controller_pt

 RGBController_AnnePro2::~RGBController_AnnePro2()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -55,6 +55,8 @@ RGBController_Arctic::RGBController_Arctic(ArcticController* controller_ptr)

 RGBController_Arctic::~RGBController_Arctic()
 {
+    Shutdown();
+
    keepalive_thread_run = false;
    keepalive_thread.join();
    delete controller;
@@ -125,6 +125,8 @@ RGBController_Areson::RGBController_Areson(AresonController* controller_ptr)

 RGBController_Areson::~RGBController_Areson()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -45,6 +45,13 @@ RGBController_AuraCore::RGBController_AuraCore(AuraCoreController* controller_pt
    SetupZones();
 }

+RGBController_AuraCore::~RGBController_AuraCore()
+{
+    Shutdown();
+
+    delete controller;
+}
+
 void RGBController_AuraCore::SetupKeyboard()
 {
    name                    = "ASUS Aura Keyboard";
@@ -170,11 +177,6 @@ void RGBController_AuraCore::SetupGA15DH()
    modes.push_back(Static);
 }

-RGBController_AuraCore::~RGBController_AuraCore()
-{
-    delete controller;
-}
-
 void RGBController_AuraCore::SetupZones()
 {
    zone auraZone;
@@ -268,6 +268,8 @@ RGBController_AsusAuraCoreLaptop::RGBController_AsusAuraCoreLaptop(AsusAuraCoreL

 RGBController_AsusAuraCoreLaptop::~RGBController_AsusAuraCoreLaptop()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -124,6 +124,8 @@ RGBController_AuraGPU::RGBController_AuraGPU(AuraGPUController * controller_ptr)

 RGBController_AuraGPU::~RGBController_AuraGPU()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -112,6 +112,8 @@ RGBController_AuraHeadsetStand::RGBController_AuraHeadsetStand(AuraHeadsetStandC

 RGBController_AuraHeadsetStand::~RGBController_AuraHeadsetStand()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -380,6 +380,8 @@ RGBController_AuraKeyboard::RGBController_AuraKeyboard(AuraKeyboardController* c

 RGBController_AuraKeyboard::~RGBController_AuraKeyboard()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -45,6 +45,8 @@ RGBController_AuraMonitor::RGBController_AuraMonitor(AuraMonitorController* cont

 RGBController_AuraMonitor::~RGBController_AuraMonitor()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -185,6 +185,8 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller

 RGBController_AuraMouse::~RGBController_AuraMouse()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -116,6 +116,8 @@ RGBController_AsusROGSpatha::RGBController_AsusROGSpatha(AsusAuraMouseGen1Contro

 RGBController_AsusROGSpatha::~RGBController_AsusROGSpatha()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -79,6 +79,8 @@ RGBController_AsusROGStrixEvolve::RGBController_AsusROGStrixEvolve(AsusAuraMouse

 RGBController_AsusROGStrixEvolve::~RGBController_AsusROGStrixEvolve()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -182,6 +182,8 @@ RGBController_AuraMousemat::RGBController_AuraMousemat(AuraMousematController* c

 RGBController_AuraMousemat::~RGBController_AuraMousemat()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -128,6 +128,8 @@ RGBController_AsusAuraRyuoAIO::RGBController_AsusAuraRyuoAIO(AsusAuraRyuoAIOCont

 RGBController_AsusAuraRyuoAIO::~RGBController_AsusAuraRyuoAIO()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -410,6 +410,8 @@ RGBController_AuraTUFKeyboard::RGBController_AuraTUFKeyboard(AuraTUFKeyboardCont

 RGBController_AuraTUFKeyboard::~RGBController_AuraTUFKeyboard()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -119,6 +119,8 @@ RGBController_AuraUSB::RGBController_AuraUSB(AuraUSBController* controller_ptr)

 RGBController_AuraUSB::~RGBController_AuraUSB()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -117,6 +117,8 @@ RGBController_AsusROGAlly::RGBController_AsusROGAlly(ROGAllyController* controll

 RGBController_AsusROGAlly::~RGBController_AsusROGAlly()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -129,6 +129,8 @@ RGBController_AsusROGStrixLC::RGBController_AsusROGStrixLC(AsusROGStrixLCControl

 RGBController_AsusROGStrixLC::~RGBController_AsusROGStrixLC()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -283,6 +283,8 @@ RGBController_AsusCerberusKeyboard::RGBController_AsusCerberusKeyboard(AsusCerbe

 RGBController_AsusCerberusKeyboard::~RGBController_AsusCerberusKeyboard()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -165,6 +165,8 @@ RGBController_AsusSagarisKeyboard::RGBController_AsusSagarisKeyboard(AsusSagaris

 RGBController_AsusSagarisKeyboard::~RGBController_AsusSagarisKeyboard()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -46,6 +46,8 @@ RGBController_AsusMonitor::RGBController_AsusMonitor(AsusMonitorController* cont

 RGBController_AsusMonitor::~RGBController_AsusMonitor()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -92,6 +92,13 @@ RGBController_AsusTUFLaptopLinux::RGBController_AsusTUFLaptopLinux(AsusTUFLaptop
    SetupZones();
 }

+RGBController_AsusTUFLaptopLinux::~RGBController_AsusTUFLaptopLinux()
+{
+    Shutdown();
+
+    delete controller;
+}
+
 void RGBController_AsusTUFLaptopLinux::SetupZones()
 {
    /*---------------------------------------------------------*\
@@ -16,6 +16,7 @@ class RGBController_AsusTUFLaptopLinux : public RGBController
 {
 public:
    RGBController_AsusTUFLaptopLinux(AsusTUFLaptopLinuxController* controller_ptr);
+    ~RGBController_AsusTUFLaptopLinux();

    void SetupZones();

@@ -85,6 +85,8 @@ RGBController_AsusTUFLaptopWMI::RGBController_AsusTUFLaptopWMI(AsusTUFLaptopCont

 RGBController_AsusTUFLaptopWMI::~RGBController_AsusTUFLaptopWMI()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -44,6 +44,8 @@ RGBController_BlinkyTape::RGBController_BlinkyTape(BlinkyTapeController* control

 RGBController_BlinkyTape::~RGBController_BlinkyTape()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -312,6 +312,8 @@ RGBController_CherryKeyboard::RGBController_CherryKeyboard(CherryKeyboardControl

 RGBController_CherryKeyboard::~RGBController_CherryKeyboard()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -199,6 +199,8 @@ RGBController_ClevoKeyboard::RGBController_ClevoKeyboard(ClevoKeyboardController

 RGBController_ClevoKeyboard::~RGBController_ClevoKeyboard()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -121,6 +121,8 @@ RGBController_ClevoLightbar::RGBController_ClevoLightbar(ClevoLightbarController

 RGBController_ClevoLightbar::~RGBController_ClevoLightbar()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -44,6 +44,8 @@ RGBController_ColorfulGPU::RGBController_ColorfulGPU(ColorfulGPUController * col

 RGBController_ColorfulGPU::~RGBController_ColorfulGPU()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -75,6 +75,8 @@ RGBController_ColorfulTuringGPU::RGBController_ColorfulTuringGPU(ColorfulTuringG

 RGBController_ColorfulTuringGPU::~RGBController_ColorfulTuringGPU()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -88,6 +88,8 @@ RGBController_CMARGBController::RGBController_CMARGBController(CMARGBController*

 RGBController_CMARGBController::~RGBController_CMARGBController()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -186,6 +186,8 @@ RGBController_CMARGBGen2A1Controller::RGBController_CMARGBGen2A1Controller(CMARG

 RGBController_CMARGBGen2A1Controller::~RGBController_CMARGBGen2A1Controller()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -140,6 +140,8 @@ RGBController_CMGD160Controller::RGBController_CMGD160Controller(CMGD160Controll

 RGBController_CMGD160Controller::~RGBController_CMGD160Controller()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -49,6 +49,8 @@ RGBController_CMKeyboardController::RGBController_CMKeyboardController(CMKeyboar

 RGBController_CMKeyboardController::~RGBController_CMKeyboardController()
 {
+    Shutdown();
+
    if(m_pController)
    {
        delete m_pController;
@@ -129,6 +129,8 @@ RGBController_CMMM711Controller::RGBController_CMMM711Controller(CMMM711Controll

 RGBController_CMMM711Controller::~RGBController_CMMM711Controller()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -122,6 +122,8 @@ RGBController_CMMM712Controller::RGBController_CMMM712Controller(CMMM712Controll

 RGBController_CMMM712Controller::~RGBController_CMMM712Controller()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -168,6 +168,8 @@ RGBController_CMMMController::RGBController_CMMMController(CMMMController* contr

 RGBController_CMMMController::~RGBController_CMMMController()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -93,6 +93,8 @@ RGBController_CMMP750Controller::RGBController_CMMP750Controller(CMMP750Controll

 RGBController_CMMP750Controller::~RGBController_CMMP750Controller()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -141,6 +141,8 @@ RGBController_CMMonitorController::RGBController_CMMonitorController(CMMonitorCo

 RGBController_CMMonitorController::~RGBController_CMMonitorController()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -152,6 +152,8 @@ RGBController_CMR6000Controller::RGBController_CMR6000Controller(CMR6000Controll

 RGBController_CMR6000Controller::~RGBController_CMR6000Controller()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -153,6 +153,8 @@ RGBController_CMRGBController::RGBController_CMRGBController(CMRGBController* co

 RGBController_CMRGBController::~RGBController_CMRGBController()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -181,6 +181,8 @@ RGBController_CMSmallARGBController::RGBController_CMSmallARGBController(CMSmall

 RGBController_CMSmallARGBController::~RGBController_CMSmallARGBController()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -71,6 +71,8 @@ RGBController_CorsairCommanderCore::RGBController_CorsairCommanderCore(CorsairCo

 RGBController_CorsairCommanderCore::~RGBController_CorsairCommanderCore()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -59,6 +59,8 @@ RGBController_CorsairDominatorPlatinum::RGBController_CorsairDominatorPlatinum(C

 RGBController_CorsairDominatorPlatinum::~RGBController_CorsairDominatorPlatinum()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -44,6 +44,8 @@ RGBController_CorsairHydro2::RGBController_CorsairHydro2(CorsairHydro2Controller

 RGBController_CorsairHydro2::~RGBController_CorsairHydro2()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -84,6 +84,8 @@ RGBController_CorsairHydro::RGBController_CorsairHydro(CorsairHydroController* c

 RGBController_CorsairHydro::~RGBController_CorsairHydro()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -57,6 +57,8 @@ RGBController_CorsairHydroPlatinum::RGBController_CorsairHydroPlatinum(CorsairHy

 RGBController_CorsairHydroPlatinum::~RGBController_CorsairHydroPlatinum()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -54,6 +54,8 @@ RGBController_CorsairICueLink::RGBController_CorsairICueLink(CorsairICueLinkCont

 RGBController_CorsairICueLink::~RGBController_CorsairICueLink()
 {
+    Shutdown();
+
    keepalive_thread_run = 0;
    keepalive_thread->join();
    delete keepalive_thread;
@@ -40,6 +40,8 @@ RGBController_CorsairLightingNode::RGBController_CorsairLightingNode(CorsairLigh

 RGBController_CorsairLightingNode::~RGBController_CorsairLightingNode()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -353,6 +353,8 @@ RGBController_CorsairK55RGBPROXT::RGBController_CorsairK55RGBPROXT(CorsairK55RGB

 RGBController_CorsairK55RGBPROXT::~RGBController_CorsairK55RGBPROXT()
 {
+    Shutdown();
+
    /*-----------------------------------------------------*\
    | Close keepalive thread                                |
    \*-----------------------------------------------------*/
@@ -166,6 +166,8 @@ RGBController_CorsairK65Mini::RGBController_CorsairK65Mini(CorsairK65MiniControl

 RGBController_CorsairK65Mini::~RGBController_CorsairK65Mini()
 {
+    Shutdown();
+
    /*-----------------------------------------------------*\
    | Close keepalive thread                                |
    \*-----------------------------------------------------*/
@@ -929,6 +929,8 @@ RGBController_CorsairPeripheral::RGBController_CorsairPeripheral(CorsairPeripher

 RGBController_CorsairPeripheral::~RGBController_CorsairPeripheral()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -72,6 +72,8 @@ RGBController_CorsairV2HW::RGBController_CorsairV2HW(CorsairPeripheralV2Controll

 RGBController_CorsairV2HW::~RGBController_CorsairV2HW()
 {
+    Shutdown();
+
    /*-----------------------------------------------------*\
    | Close keepalive thread                                |
    \*-----------------------------------------------------*/
@@ -59,6 +59,8 @@ RGBController_CorsairV2SW::RGBController_CorsairV2SW(CorsairPeripheralV2Controll

 RGBController_CorsairV2SW::~RGBController_CorsairV2SW()
 {
+    Shutdown();
+
    /*-----------------------------------------------------*\
    | Close keepalive thread                                |
    \*-----------------------------------------------------*/
@@ -59,6 +59,8 @@ RGBController_CorsairVengeance::RGBController_CorsairVengeance(CorsairVengeanceC

 RGBController_CorsairVengeance::~RGBController_CorsairVengeance()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -175,6 +175,8 @@ RGBController_CorsairVengeancePro::RGBController_CorsairVengeancePro(CorsairVeng

 RGBController_CorsairVengeancePro::~RGBController_CorsairVengeancePro()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -226,6 +226,8 @@ RGBController_CorsairWireless::RGBController_CorsairWireless(CorsairWirelessCont

 RGBController_CorsairWireless::~RGBController_CorsairWireless()
 {
+    Shutdown();
+
    /*-----------------------------------------------------*\
    | Close keepalive thread                                |
    \*-----------------------------------------------------*/
@@ -375,6 +375,8 @@ RGBController_CougarKeyboard::RGBController_CougarKeyboard(CougarKeyboardControl

 RGBController_CougarKeyboard::~RGBController_CougarKeyboard()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -107,6 +107,8 @@ RGBController_CougarRevengerST::RGBController_CougarRevengerST(CougarRevengerSTC

 RGBController_CougarRevengerST::~RGBController_CougarRevengerST()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -43,6 +43,8 @@ RGBController_CreativeSoundBlasterAE5::RGBController_CreativeSoundBlasterAE5(Cre

 RGBController_CreativeSoundBlasterAE5::~RGBController_CreativeSoundBlasterAE5()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -46,6 +46,8 @@ RGBController_CreativeSoundBlasterXG6::RGBController_CreativeSoundBlasterXG6(Cre

 RGBController_CreativeSoundBlasterXG6::~RGBController_CreativeSoundBlasterXG6()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -129,6 +129,8 @@ RGBController_Crucial::RGBController_Crucial(CrucialController* controller_ptr)

 RGBController_Crucial::~RGBController_Crucial()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -40,6 +40,8 @@ RGBController_CryorigH7QuadLumi::RGBController_CryorigH7QuadLumi(CryorigH7QuadLu

 RGBController_CryorigH7QuadLumi::~RGBController_CryorigH7QuadLumi()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -52,6 +52,8 @@ RGBController_DDP::RGBController_DDP(std::vector<DDPDevice> device_list)

 RGBController_DDP::~RGBController_DDP()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -101,6 +101,8 @@ RGBController_DMX::RGBController_DMX(std::vector<DMXDevice> device_list)

 RGBController_DMX::~RGBController_DMX()
 {
+    Shutdown();
+
    if(keepalive_thread != nullptr)
    {
        keepalive_thread_run = 0;
@@ -48,6 +48,8 @@ RGBController_DRGB::RGBController_DRGB(DRGBController* controller_ptr)

 RGBController_DRGB::~RGBController_DRGB()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -153,6 +153,8 @@ RGBController_DarkProjectKeyboard::RGBController_DarkProjectKeyboard(DarkProject

 RGBController_DarkProjectKeyboard::~RGBController_DarkProjectKeyboard()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -248,6 +248,8 @@ RGBController_DasKeyboard::RGBController_DasKeyboard(DasKeyboardController* cont

 RGBController_DasKeyboard::~RGBController_DasKeyboard()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -548,7 +548,7 @@ RGBController_Debug::RGBController_Debug(bool custom_controller, json debug_sett

 RGBController_Debug::~RGBController_Debug()
 {
-
+    Shutdown();
 }

 void RGBController_Debug::DeviceResizeZone(int index, int new_size)
@@ -34,7 +34,9 @@ RGBController_DreamCheeky::RGBController_DreamCheeky(DreamCheekyController* cont

 RGBController_DreamCheeky::~RGBController_DreamCheeky()
 {
+    Shutdown();

+    delete controller;
 }

 void RGBController_DreamCheeky::SetupZones()
@@ -222,6 +222,8 @@ RGBController_DuckyKeyboard::RGBController_DuckyKeyboard(DuckyKeyboardController

 RGBController_DuckyKeyboard::~RGBController_DuckyKeyboard()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -164,6 +164,8 @@ RGBController_DygmaRaise::RGBController_DygmaRaise(DygmaRaiseController* control

 RGBController_DygmaRaise::~RGBController_DygmaRaise()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -310,6 +310,8 @@ RGBController_E131::RGBController_E131(std::vector<E131Device> device_list)

 RGBController_E131::~RGBController_E131()
 {
+    Shutdown();
+
    if(keepalive_thread != nullptr)
    {
        keepalive_thread_run = 0;
@@ -125,6 +125,8 @@ RGBController_EKController::RGBController_EKController(EKController* controller_

 RGBController_EKController::~RGBController_EKController()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -191,6 +191,8 @@ RGBController_ENESMBus::RGBController_ENESMBus(ENESMBusController * controller_p

 RGBController_ENESMBus::~RGBController_ENESMBus()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -205,6 +205,8 @@ RGBController_EVGAGPUv3::RGBController_EVGAGPUv3(EVGAGPUv3Controller* controller

 RGBController_EVGAGPUv3::~RGBController_EVGAGPUv3()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -77,6 +77,8 @@ RGBController_EVGAGP102::RGBController_EVGAGP102(std::vector<EVGAGP102Controller

 RGBController_EVGAGP102::~RGBController_EVGAGP102()
 {
+    Shutdown();
+
    for(unsigned int i = 0; i < controllers.size(); i++)
    {
        delete controllers[i];
@@ -86,6 +86,8 @@ RGBController_EVGAGPUv1::RGBController_EVGAGPUv1(EVGAGPUv1Controller* controller

 RGBController_EVGAGPUv1::~RGBController_EVGAGPUv1()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -74,6 +74,8 @@ RGBController_EVGAACX30SMBus::RGBController_EVGAACX30SMBus(EVGAACX30SMBusControl

 RGBController_EVGAACX30SMBus::~RGBController_EVGAACX30SMBus()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -129,6 +129,8 @@ RGBController_EVGAGPUv2::RGBController_EVGAGPUv2(EVGAGPUv2Controller* controller

 RGBController_EVGAGPUv2::~RGBController_EVGAGPUv2()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -390,6 +390,8 @@ RGBController_EVGAKeyboard::RGBController_EVGAKeyboard(EVGAKeyboardController* c

 RGBController_EVGAKeyboard::~RGBController_EVGAKeyboard()
 {
+    Shutdown();
+
    delete controller;
 }

@@ -138,6 +138,8 @@ RGBController_EVGAMouse::RGBController_EVGAMouse(EVGAMouseController* controller

 RGBController_EVGAMouse::~RGBController_EVGAMouse()
 {
+    Shutdown();
+
    delete controller;
 }