mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-30 11:55:35 +08:00
Fix wrong QHash value lookup for voice channels in use
This commit is contained in:
committed by
Klaus Basan
parent
3804612bed
commit
9f1a51fb13
@@ -322,7 +322,7 @@ namespace BlackCore
|
||||
m_voiceChannelMapping.remove(BlackMisc::Aviation::CComSystem::Com1);
|
||||
|
||||
// If the voice channel is not used by anybody else
|
||||
if (!m_voiceChannelMapping.key(oldVoiceChannel))
|
||||
if (!m_voiceChannelMapping.values().contains(oldVoiceChannel))
|
||||
{
|
||||
oldVoiceChannel->leaveVoiceRoom();
|
||||
m_unusedVoiceChannels.push_back(oldVoiceChannel);
|
||||
@@ -337,7 +337,7 @@ namespace BlackCore
|
||||
{
|
||||
QSharedPointer<IVoiceChannel> newVoiceChannel = getVoiceChannelBy(newRoomCom1);
|
||||
newVoiceChannel->setOwnAircraftCallsign(ownCallsign);
|
||||
bool inUse = m_voiceChannelMapping.key(newVoiceChannel);
|
||||
bool inUse = m_voiceChannelMapping.values().contains(newVoiceChannel);
|
||||
m_voiceChannelMapping.insert(BlackMisc::Aviation::CComSystem::Com1, newVoiceChannel);
|
||||
|
||||
// If the voice channel is not used by anybody else
|
||||
@@ -362,7 +362,7 @@ namespace BlackCore
|
||||
m_voiceChannelMapping.remove(BlackMisc::Aviation::CComSystem::Com2);
|
||||
|
||||
// If the voice channel is not used by anybody else
|
||||
if (!m_voiceChannelMapping.key(oldVoiceChannel))
|
||||
if (!m_voiceChannelMapping.values().contains(oldVoiceChannel))
|
||||
{
|
||||
oldVoiceChannel->leaveVoiceRoom();
|
||||
m_unusedVoiceChannels.push_back(oldVoiceChannel);
|
||||
@@ -377,7 +377,7 @@ namespace BlackCore
|
||||
{
|
||||
auto newVoiceChannel = getVoiceChannelBy(newRoomCom2);
|
||||
newVoiceChannel->setOwnAircraftCallsign(ownCallsign);
|
||||
bool inUse = m_voiceChannelMapping.key(newVoiceChannel);
|
||||
bool inUse = m_voiceChannelMapping.values().contains(newVoiceChannel);
|
||||
m_voiceChannelMapping.insert(BlackMisc::Aviation::CComSystem::Com2, newVoiceChannel);
|
||||
|
||||
// If the voice channel is not used by anybody else
|
||||
|
||||
Reference in New Issue
Block a user