diff --git a/src/blackgui/settings/textmessagesettings.cpp b/src/blackgui/settings/textmessagesettings.cpp index d64b89f91..e9a666163 100644 --- a/src/blackgui/settings/textmessagesettings.cpp +++ b/src/blackgui/settings/textmessagesettings.cpp @@ -66,7 +66,7 @@ namespace BlackGui::Settings if (textMessage.isRadioMessage()) { if (!this->popupFrequencyMessages()) { return false; } - if (ownAircraft.isActiveFrequencyWithinChannelSpacing(textMessage.getFrequency())) { return true; } + if (ownAircraft.hasComActiveFrequency(textMessage.getFrequency())) { return true; } } return false; } diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp index 0dfc26a26..1b62677b8 100644 --- a/src/blackmisc/simulation/simulatedaircraft.cpp +++ b/src/blackmisc/simulation/simulatedaircraft.cpp @@ -563,7 +563,7 @@ namespace BlackMisc::Simulation m_pilot.setCallsign(callsign); } - bool CSimulatedAircraft::isActiveFrequencyWithinChannelSpacing(const CFrequency &comFrequency) const + bool CSimulatedAircraft::hasComActiveFrequency(const CFrequency &comFrequency) const { return m_com1system.isActiveFrequencySameFrequency(comFrequency) || m_com2system.isActiveFrequencySameFrequency(comFrequency); diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h index 0ed3dbd04..dae4595e4 100644 --- a/src/blackmisc/simulation/simulatedaircraft.h +++ b/src/blackmisc/simulation/simulatedaircraft.h @@ -290,8 +290,8 @@ namespace BlackMisc //! Identical COM system? bool hasSameComData(const Aviation::CComSystem &com1, const Aviation::CComSystem &com2, const Aviation::CTransponder &transponder); - //! Is any (COM1/2) active frequency within the COM units channel spacing? - bool isActiveFrequencyWithinChannelSpacing(const PhysicalQuantities::CFrequency &comFrequency) const; + //! Is comFrequency selected in COM1 or COM2 as active frequency (with 5 kHz spacing for .x20/.x25 and .x70/.x75) + bool hasComActiveFrequency(const PhysicalQuantities::CFrequency &comFrequency) const; //! Get transponder const Aviation::CTransponder &getTransponder() const { return m_transponder; }