flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-16 10:25:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T656, Bug fix for CPZ6092 issue

Browse Source
This commit is contained in:
Klaus Basan
2019-05-12 16:15:41 +02:00
parent 8b69b7a637
commit 4b06d46166
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -314,15 +314,17 @@ namespace BlackCore
CTextMessage tm; CTextMessage tm;
tm.setSenderCallsign(ownAircraft.getCallsign()); tm.setSenderCallsign(ownAircraft.getCallsign());
if (receiver.startsWith("c") && receiver.endsWith("1")) // based on the CPZ bug https://discordapp.com/channels/539048679160676382/539486309882789888/576765888401768449
// no longer use starts/ends with
if (receiver == QStringView(u"c1") || receiver == QStringView(u"com1") || receiver == QStringView(u"comm1"))
{ {
tm.setFrequency(ownAircraft.getCom1System().getFrequencyActive()); tm.setFrequency(ownAircraft.getCom1System().getFrequencyActive());
} }
else if (receiver.startsWith("c") && receiver.endsWith("2")) else if (receiver == QStringView(u"c2") || receiver == QStringView(u"com2") || receiver == QStringView(u"comm2"))
{ {
tm.setFrequency(ownAircraft.getCom2System().getFrequencyActive()); tm.setFrequency(ownAircraft.getCom2System().getFrequencyActive());
} }
else if (receiver == "u" || receiver.startsWith("uni")) else if (receiver == "u" || receiver == QStringView(u"uni") || receiver == QStringView(u"unicom"))
{ {
tm.setFrequency(CPhysicalQuantitiesConstants::FrequencyUnicom()); tm.setFrequency(CPhysicalQuantitiesConstants::FrequencyUnicom());
} }

2
src/blackgui/components/textmessagecomponent.cpp
View File

@@ -89,7 +89,7 @@ namespace BlackGui
if (sGui && sGui->getCoreFacade() && sGui->getIContextNetwork() && sGui->getIContextOwnAircraft()) if (sGui && sGui->getCoreFacade() && sGui->getIContextNetwork() && sGui->getIContextOwnAircraft())
{ {
c = connect(this, &CTextMessageComponent::commandEntered, sGui->getCoreFacade(), &CCoreFacade::parseCommandLine); c = connect(this, &CTextMessageComponent::commandEntered, sGui->getCoreFacade(), &CCoreFacade::parseCommandLine, Qt::QueuedConnection);
Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect"); Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
c = connect(sGui->getIContextNetwork(), &IContextNetwork::textMessagesReceived, this, &CTextMessageComponent::onTextMessageReceived, Qt::QueuedConnection); c = connect(sGui->getIContextNetwork(), &IContextNetwork::textMessagesReceived, this, &CTextMessageComponent::onTextMessageReceived, Qt::QueuedConnection);
Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect"); Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");