From 041e0f57d9b6fe4e58e9c3cbd3c0f3a6833d20d9 Mon Sep 17 00:00:00 2001
From: Geoffrey Merck <F4FXL@users.noreply.github.com>
Date: Fri, 18 Feb 2022 07:23:37 +0100
Subject: [PATCH] #21 finalise in Entry

---
 DStarGateway/DStarGatewayThread.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/DStarGateway/DStarGatewayThread.cpp b/DStarGateway/DStarGatewayThread.cpp
index a2d4bc6..73ea87c 100644
--- a/DStarGateway/DStarGatewayThread.cpp
+++ b/DStarGateway/DStarGatewayThread.cpp
@@ -131,19 +131,7 @@ m_restrictList(NULL)
 
 CDStarGatewayThread::~CDStarGatewayThread()
 {
-	CHeaderData::finalise();
-	CG2Handler::finalise();
-	CDExtraHandler::finalise();
-	CDPlusHandler::finalise();
-	CDCSHandler::finalise();
-	CRepeaterHandler::finalise();
-#ifdef USE_STARNET
-	CStarNetHandler::finalise();
-#endif
-#ifdef USE_CCS
-	CCCSHandler::finalise();
-#endif
-	CAudioUnit::finalise();
+
 }
 
 void* CDStarGatewayThread::Entry()
@@ -491,7 +479,19 @@ void* CDStarGatewayThread::Entry()
 		delete headerLogger;
 	}
 
+	CHeaderData::finalise();
+	CG2Handler::finalise();
+	CDExtraHandler::finalise();
 	CDPlusHandler::finalise();
+	CDCSHandler::finalise();
+	CRepeaterHandler::finalise();
+#ifdef USE_STARNET
+	CStarNetHandler::finalise();
+#endif
+#ifdef USE_CCS
+	CCCSHandler::finalise();
+#endif
+	CAudioUnit::finalise();
 
 	return NULL;
 }