2 files changed, 12 insertions, 0 deletions
diff --git a/AudioManagerDaemon/src/CAmControlReceiver.cpp b/AudioManagerDaemon/src/CAmControlReceiver.cpp
index 583ad0d..6960fd0 100644
--- a/AudioManagerDaemon/src/CAmControlReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmControlReceiver.cpp
@@ -485,6 +485,8 @@ void CAmControlReceiver::confirmControllerRundown()
 {
     logInfo ("CAmControlReceiver::confirmControllerRundown(), exiting regularly");
     //once the controller is ready, it will exit.
+    CAmDltWrapper* inst(getWrapper());
+    inst->deinit();
     exit (0);
     //todo: one time implement here system interaction with NSM
 }
diff --git a/AudioManagerDaemon/src/CAmDltWrapper.cpp b/AudioManagerDaemon/src/CAmDltWrapper.cpp
index 51ab7ce..c8fe8e1 100644
--- a/AudioManagerDaemon/src/CAmDltWrapper.cpp
+++ b/AudioManagerDaemon/src/CAmDltWrapper.cpp
@@ -52,6 +52,13 @@ void CAmDltWrapper::unregisterContext(DltContext & handle)
 #endif
 }
 
+void CAmDltWrapper::deinit()
+{
+#ifdef WITH_DLT
+    unregisterContext(mDltContext);
+#endif
+}
+
 CAmDltWrapper::CAmDltWrapper(const bool enableNoDLTDebug) :
 #ifndef WITH_DLT
         mEnableNoDLTDebug(enableNoDLTDebug),
@@ -244,7 +251,10 @@ void CAmDltWrapper::enableNoDLTDebug(const bool enableNoDLTDebug)
 CAmDltWrapper::~CAmDltWrapper()
 {
     if (mpDLTWrapper)
+    {
+        mpDLTWrapper->unregisterContext(mDltContext);
         delete mpDLTWrapper;
+    }
 }
 }