From f15674330fa08cedef92b15b0063b7d0142bf29d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 10 Oct 2019 20:31:19 +0200 Subject: [PATCH] [AFV] Ref T739, we are checking "connected" already, no need to check it again --- src/blackcore/afv/clients/afvclient.cpp | 39 ++++++++++++------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/src/blackcore/afv/clients/afvclient.cpp b/src/blackcore/afv/clients/afvclient.cpp index 65b2dbcfb..d5df9911c 100644 --- a/src/blackcore/afv/clients/afvclient.cpp +++ b/src/blackcore/afv/clients/afvclient.cpp @@ -563,7 +563,10 @@ namespace BlackCore return; } - if (! m_connection->isConnected()) { return; } + { + QMutexLocker lock(&m_mutex); + if (!m_connection->isConnected()) { return; } + } const QString callsign = this->getCallsign(); // threadsafe const auto transmittingTransceivers = this->getTransmittingTransceivers(); // threadsafe @@ -571,32 +574,26 @@ namespace BlackCore { if (transmit) { + AudioTxOnTransceiversDto dto; + dto.callsign = callsign.toStdString(); + dto.sequenceCounter = args.sequenceCounter; + dto.audio = std::vector(args.audio.begin(), args.audio.end()); + dto.lastPacket = false; + dto.transceivers = transmittingTransceivers.toStdVector(); QMutexLocker lock(&m_mutex); - if (m_connection->isConnected()) - { - AudioTxOnTransceiversDto dto; - dto.callsign = callsign.toStdString(); - dto.sequenceCounter = args.sequenceCounter; - dto.audio = std::vector(args.audio.begin(), args.audio.end()); - dto.lastPacket = false; - dto.transceivers = transmittingTransceivers.toStdVector(); - m_connection->sendToVoiceServer(dto); - } + m_connection->sendToVoiceServer(dto); } if (!transmit && transmitHistory) { + AudioTxOnTransceiversDto dto; + dto.callsign = callsign.toStdString(); + dto.sequenceCounter = args.sequenceCounter; + dto.audio = std::vector(args.audio.begin(), args.audio.end()); + dto.lastPacket = true; + dto.transceivers = transmittingTransceivers.toStdVector(); QMutexLocker lock(&m_mutex); - if (m_connection->isConnected()) - { - AudioTxOnTransceiversDto dto; - dto.callsign = callsign.toStdString(); - dto.sequenceCounter = args.sequenceCounter; - dto.audio = std::vector(args.audio.begin(), args.audio.end()); - dto.lastPacket = true; - dto.transceivers = transmittingTransceivers.toStdVector(); - m_connection->sendToVoiceServer(dto); - } + m_connection->sendToVoiceServer(dto); } m_transmitHistory = transmit; // threadsafe }