From c9608f835e7212afb3a4e9a69ea207ca45b1e53c Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 16 Sep 2022 20:49:36 +0100 Subject: [PATCH] Fixed seg fault bug on debug server startup failure --- src/DebugServer/DebugServerComponent.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/DebugServer/DebugServerComponent.cpp b/src/DebugServer/DebugServerComponent.cpp index dababa02..e4edd590 100644 --- a/src/DebugServer/DebugServerComponent.cpp +++ b/src/DebugServer/DebugServerComponent.cpp @@ -80,7 +80,8 @@ namespace Bloom::DebugServer } void DebugServerComponent::shutdown() { - if (this->getThreadState() == ThreadState::STOPPED + if ( + this->getThreadState() == ThreadState::STOPPED || this->getThreadState() == ThreadState::SHUTDOWN_INITIATED ) { return; @@ -88,7 +89,11 @@ namespace Bloom::DebugServer this->setThreadState(ThreadState::SHUTDOWN_INITIATED); Logger::info("Shutting down DebugServer"); - this->server->close(); + + if (this->server) { + this->server->close(); + } + this->setThreadStateAndEmitEvent(ThreadState::STOPPED); this->eventListener->setInterruptEventNotifier(nullptr);