flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[AFV] Ref T739, we are checking "connected" already, no need to check it again

Browse Source
This commit is contained in:
Klaus Basan
2019-10-10 20:31:19 +02:00
committed by Mat Sutcliffe
parent e3ed71a919
commit f15674330f
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackcore/afv/clients/afvclient.cpp
View File

@@ -563,16 +563,16 @@ namespace BlackCore
return; return;
} }
if (! m_connection->isConnected()) { return; } {
QMutexLocker lock(&m_mutex);
if (!m_connection->isConnected()) { return; }
}
const QString callsign = this->getCallsign(); // threadsafe const QString callsign = this->getCallsign(); // threadsafe
const auto transmittingTransceivers = this->getTransmittingTransceivers(); // threadsafe const auto transmittingTransceivers = this->getTransmittingTransceivers(); // threadsafe
if (transmittingTransceivers.size() > 0) if (transmittingTransceivers.size() > 0)
{ {
if (transmit) if (transmit)
{
QMutexLocker lock(&m_mutex);
if (m_connection->isConnected())
{ {
AudioTxOnTransceiversDto dto; AudioTxOnTransceiversDto dto;
dto.callsign = callsign.toStdString(); dto.callsign = callsign.toStdString();
@@ -580,14 +580,11 @@ namespace BlackCore
dto.audio = std::vector<char>(args.audio.begin(), args.audio.end()); dto.audio = std::vector<char>(args.audio.begin(), args.audio.end());
dto.lastPacket = false; dto.lastPacket = false;
dto.transceivers = transmittingTransceivers.toStdVector(); dto.transceivers = transmittingTransceivers.toStdVector();
QMutexLocker lock(&m_mutex);
m_connection->sendToVoiceServer(dto); m_connection->sendToVoiceServer(dto);
} }
}
if (!transmit && transmitHistory) if (!transmit && transmitHistory)
{
QMutexLocker lock(&m_mutex);
if (m_connection->isConnected())
{ {
AudioTxOnTransceiversDto dto; AudioTxOnTransceiversDto dto;
dto.callsign = callsign.toStdString(); dto.callsign = callsign.toStdString();
@@ -595,9 +592,9 @@ namespace BlackCore
dto.audio = std::vector<char>(args.audio.begin(), args.audio.end()); dto.audio = std::vector<char>(args.audio.begin(), args.audio.end());
dto.lastPacket = true; dto.lastPacket = true;
dto.transceivers = transmittingTransceivers.toStdVector(); dto.transceivers = transmittingTransceivers.toStdVector();
QMutexLocker lock(&m_mutex);
m_connection->sendToVoiceServer(dto); m_connection->sendToVoiceServer(dto);
} }
}
m_transmitHistory = transmit; // threadsafe m_transmitHistory = transmit; // threadsafe
} }
} }