fly/flightgear
1
0
Fork 0
Code Activity

ATC_mgr fix: clear user aircraft ATC on reposition

Browse source 
Avoids a stale controller causing crashes after a reposition. Triggered
by C172 tutorials.
This commit is contained in:
Automatic Release Builder 2020-10-27 19:22:09 +00:00 committed by James Turner
parent 9f3f1a8f58
commit d75f05d4c0
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ATC/atc_mgr.cxx
View file

@ -256,11 +256,15 @@ void FGATCManager::reposition()
// available again. postinit() will recompute a new value if required // available again. postinit() will recompute a new value if required
FGAIManager* aiManager = globals->get_subsystem<FGAIManager>(); FGAIManager* aiManager = globals->get_subsystem<FGAIManager>();
auto userAircraft = aiManager->getUserAircraft(); auto userAircraft = aiManager->getUserAircraft();
if (userAircraft && userAircraft->GetFlightPlan()) { if (userAircraft) {
auto userAIFP = userAircraft->GetFlightPlan(); if (userAircraft->GetFlightPlan()) {
userAIFP->setGate({}); // clear any assignment auto userAIFP = userAircraft->GetFlightPlan();
userAIFP->setGate({}); // clear any assignment
}
userAircraft->clearATCController();
} }
postinit(); // critical for position-init logic postinit(); // critical for position-init logic
} }