From 2afddf9bbfa3538f75e25546300094e163c7ef3a Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Fri, 21 May 2021 20:43:14 -0500 Subject: [PATCH] Only join/delete E1.31 keepalive thread if it has actually been created --- Controllers/E131Controller/RGBController_E131.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Controllers/E131Controller/RGBController_E131.cpp b/Controllers/E131Controller/RGBController_E131.cpp index 3ca7d91f..82ebd98a 100644 --- a/Controllers/E131Controller/RGBController_E131.cpp +++ b/Controllers/E131Controller/RGBController_E131.cpp @@ -293,9 +293,13 @@ RGBController_E131::RGBController_E131(std::vector device_list) RGBController_E131::~RGBController_E131() { - keepalive_thread_run = 0; - keepalive_thread->join(); - delete keepalive_thread; + if(keepalive_thread != nullptr) + { + keepalive_thread_run = 0; + keepalive_thread->join(); + delete keepalive_thread; + } + /*---------------------------------------------------------*\ | Delete the matrix map | \*---------------------------------------------------------*/