From 004cea67a38f4e03cd7ffd57a2c46146faee7859 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Mon, 6 Jul 2020 03:47:41 -0700 Subject: [PATCH] better thread deletion --- ambedtest/ccodecstream.cpp | 1 + ambedtest/ctranscoder.cpp | 1 + src/ccodecstream.cpp | 1 + src/cdmriddir.cpp | 1 + src/cprotocol.cpp | 1 + src/cwiresxcmdhandler.cpp | 1 + src/cysfnodedir.cpp | 1 + 7 files changed, 7 insertions(+) diff --git a/ambedtest/ccodecstream.cpp b/ambedtest/ccodecstream.cpp index 90fca6c..fd4d9a8 100644 --- a/ambedtest/ccodecstream.cpp +++ b/ambedtest/ccodecstream.cpp @@ -66,6 +66,7 @@ CCodecStream::~CCodecStream() { m_pThread->join(); delete m_pThread; + m_pThread = NULL; } } diff --git a/ambedtest/ctranscoder.cpp b/ambedtest/ctranscoder.cpp index 65bc28f..7ce85d6 100644 --- a/ambedtest/ctranscoder.cpp +++ b/ambedtest/ctranscoder.cpp @@ -79,6 +79,7 @@ CTranscoder::~CTranscoder() { m_pThread->join(); delete m_pThread; + m_pThread = NULL; } } diff --git a/src/ccodecstream.cpp b/src/ccodecstream.cpp index 9bd008c..33f1304 100644 --- a/src/ccodecstream.cpp +++ b/src/ccodecstream.cpp @@ -68,6 +68,7 @@ CCodecStream::~CCodecStream() { m_pThread->join(); delete m_pThread; + m_pThread = NULL; } // empty local queue diff --git a/src/cdmriddir.cpp b/src/cdmriddir.cpp index 1b2067e..273204c 100644 --- a/src/cdmriddir.cpp +++ b/src/cdmriddir.cpp @@ -46,6 +46,7 @@ CDmridDir::~CDmridDir() { m_pThread->join(); delete m_pThread; + m_pThread = NULL; } } diff --git a/src/cprotocol.cpp b/src/cprotocol.cpp index d5d34f3..9a20ad6 100644 --- a/src/cprotocol.cpp +++ b/src/cprotocol.cpp @@ -47,6 +47,7 @@ CProtocol::~CProtocol() { m_pThread->join(); delete m_pThread; + m_pThread = NULL; } // Close sockets diff --git a/src/cwiresxcmdhandler.cpp b/src/cwiresxcmdhandler.cpp index ed22a02..c38809c 100644 --- a/src/cwiresxcmdhandler.cpp +++ b/src/cwiresxcmdhandler.cpp @@ -56,6 +56,7 @@ CWiresxCmdHandler::~CWiresxCmdHandler() { m_pThread->join(); delete m_pThread; + m_pThread = NULL; } // empty queue diff --git a/src/cysfnodedir.cpp b/src/cysfnodedir.cpp index b068133..e654f30 100644 --- a/src/cysfnodedir.cpp +++ b/src/cysfnodedir.cpp @@ -45,6 +45,7 @@ CYsfNodeDir::~CYsfNodeDir() { m_pThread->join(); delete m_pThread; + m_pThread = NULL; } }