1 files changed, 9 insertions, 4 deletions
diff --git a/src/chatServer.cpp b/src/chatServer.cpp
index 06f2021..2f6ddf5 100644
--- a/src/chatServer.cpp
+++ b/src/chatServer.cpp
@@ -1,6 +1,7 @@
 #include "chatServer.hpp"
 #include "server.hpp"
 #include "sessionManager.hpp"
+#include "chatManager.hpp"
 
 CChatServer::CChatServer() = default;
 
@@ -9,22 +10,26 @@ CChatServer::~CChatServer() {
 }
 
 void CChatServer::cleanup() {
-  g_pServer.reset();
+  g_pChatManager.reset();
   g_pSessionManager.reset();
+  g_pServer.reset();
+
+  if (m_sessionThread.joinable())
+    m_sessionThread.join();
 }
 
 void CChatServer::initManagers() {
   g_pServer		  = std::make_unique<CServer>(8080);
 	g_pSessionManager = std::make_shared<CSessionManager>();
+  g_pChatManager    = std::make_unique<CChatManager>();
 }
 
-
 void CChatServer::start() {
   initManagers();
 
   // will await while waiting for accept() to return a new client
-  std::jthread sessionThread = std::jthread(&CSessionManager::enterLoop, g_pSessionManager);
-  sessionThread.detach();
+  m_sessionThread = std::jthread(&CSessionManager::enterLoop, g_pSessionManager);
+  m_sessionThread.detach();
 
   while (true) {
   }