Skip to content

Commit 333519e

Browse files
committed
Fix incorrect CJS showing in missed approach alarm ACK button in tower unit when scratchpad string is occupied
1 parent bd83a70 commit 333519e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

MissedApproach/MissedApproachAlarm.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -476,11 +476,11 @@ void MissedApproachAlarm::OnFlightPlanControllerAssignedDataUpdate(CFlightPlan F
476476
}
477477
}
478478

479-
// Trigger alarm (APP)
479+
// Clear Scratchpad
480480
scratchPadString.erase(0, strlen("MISAP_"));
481481
controllerData.SetScratchPadString(scratchPadString.c_str());
482482

483-
// Don't add to vector unless runway is selected and active
483+
// Don't Trigger alarm (APP) unless runway is selected and active
484484
if (find(activeMAPPRunways.begin(), activeMAPPRunways.end(), data.GetArrivalRwy()) == activeMAPPRunways.end()) return;
485485
missedAcftData.push_back(FlightPlan.GetCallsign());
486486
missedAcftData.push_back(data.GetDestination());

MissedApproach/MissedApproachPlugin.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,10 @@ void MissedApproachPlugin::ackMissedApproach(const char* callsign) {
5252
data = fpl.GetFlightPlanData();
5353
controllerData = fpl.GetControllerAssignedData();
5454

55-
string buf = controllerData.GetScratchPadString();
56-
buf.append("MISAP-ACK_");
55+
string buf = "MISAP-ACK_";
5756
buf.append(myself.GetPositionId());
57+
buf.append(controllerData.GetScratchPadString());
5858
controllerData.SetScratchPadString(buf.c_str());
59-
//couldn't find it, handle error
6059
}
6160

6261
void MissedApproachPlugin::resetMissedApproach(const char* callsign) {
@@ -118,5 +117,6 @@ bool MissedApproachPlugin::matchArrivalAirport(const char* arrivalArpt) {
118117
}
119118

120119
string MissedApproachPlugin::checkForAck(string scratchPadString) {
121-
return scratchPadString.substr(10, 2);
120+
auto it = scratchPadString.find("MISAP-ACK_");
121+
return scratchPadString.substr(it + 10, 2);
122122
}

0 commit comments

Comments
 (0)