From 49272d3b1c1de10612e95fc818c1f551ac316144 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 20 Oct 2019 01:38:25 +0200 Subject: [PATCH] [AFV] Ref T739, use QMutex::Recursive to avoid deadlock in same thread --- src/blackcore/afv/clients/afvclient.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/blackcore/afv/clients/afvclient.h b/src/blackcore/afv/clients/afvclient.h index b1485f62f..a96fbef48 100644 --- a/src/blackcore/afv/clients/afvclient.h +++ b/src/blackcore/afv/clients/afvclient.h @@ -355,13 +355,13 @@ namespace BlackCore std::atomic_bool m_connectedWithContext { false }; - mutable QMutex m_mutex; - mutable QMutex m_mutexInputStream; - mutable QMutex m_mutexOutputStream; - mutable QMutex m_mutexTransceivers; - mutable QMutex m_mutexCallsign; - mutable QMutex m_mutexConnection; - mutable QMutex m_mutexVolume; + mutable QMutex m_mutex { QMutex::Recursive }; + mutable QMutex m_mutexInputStream { QMutex::Recursive }; + mutable QMutex m_mutexOutputStream { QMutex::Recursive }; + mutable QMutex m_mutexTransceivers { QMutex::Recursive }; + mutable QMutex m_mutexCallsign { QMutex::Recursive }; + mutable QMutex m_mutexConnection { QMutex::Recursive }; + mutable QMutex m_mutexVolume { QMutex::Recursive }; }; } // ns } // ns