fly/flightgear
1
0
Fork 0
Code Activity

Different fix for traffic shutdown crash.

Browse source 
Fix for: https://sourceforge.net/p/flightgear/codetickets/1864/
This commit is contained in:
James Turner 2016-04-14 18:54:52 +01:00
parent 43add4f820
commit c15e4753ac
2 changed files with 49 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/ATC/trafficcontrol.cxx
View file

@ -58,6 +58,30 @@ using std::string;
using std::cout;
using std::endl;
namespace {
TrafficVectorIterator findTraffic(TrafficVector& vec, int id)
{
TrafficVectorIterator it = vec.begin();
for (; it != vec.end(); ++it) {
if (it->getId() == id) {
return it;
}
}
return it; // vec.end, effectively
}
void clearTrafficControllers(TrafficVector& vec)
{
TrafficVectorIterator it = vec.begin();
for (; it != vec.end(); ++it) {
it->getAircraft()->clearATCController();
}
}
} // of anonymous namespace
/***************************************************************************
* ActiveRunway
**************************************************************************/
@ -190,9 +214,6 @@ FGTrafficRecord::FGTrafficRecord():
FGTrafficRecord::~FGTrafficRecord()
{
//if (aircraft) {
// aircraft->clearATCController();
//}
}
void FGTrafficRecord::setPositionAndIntentions(int pos,
@ -828,6 +849,15 @@ FGTowerController::FGTowerController(FGAirportDynamics *par) :
parent = par;
}
FGTowerController::~FGTowerController()
{
// to avoid the exception described in:
// https://sourceforge.net/p/flightgear/codetickets/1864/
// we want to ensure AI aircraft signing-off is a no-op now
clearTrafficControllers(activeTraffic);
}
//
void FGTowerController::announcePosition(int id,
FGAIFlightPlan * intendedRoute,
@ -1093,6 +1123,11 @@ FGStartupController::FGStartupController(FGAirportDynamics *par):
parent = par;
}
FGStartupController::~FGStartupController()
{
clearTrafficControllers(activeTraffic);
}
void FGStartupController::announcePosition(int id,
FGAIFlightPlan * intendedRoute,
int currentPosition, double lat,
@ -1552,6 +1587,11 @@ FGApproachController::FGApproachController(FGAirportDynamics *par):
parent = par;
}
FGApproachController::~FGApproachController()
{
clearTrafficControllers(activeTraffic);
}
//
void FGApproachController::announcePosition(int id,
FGAIFlightPlan * intendedRoute,

9
src/ATC/trafficcontrol.hxx
View file

@ -462,7 +462,8 @@ private:
public:
FGTowerController(FGAirportDynamics *parent);
virtual ~FGTowerController() {};
virtual ~FGTowerController();
virtual void announcePosition(int id, FGAIFlightPlan *intendedRoute, int currentRoute,
double lat, double lon,
double hdg, double spd, double alt, double radius, int leg,
@ -498,7 +499,8 @@ private:
public:
FGStartupController(FGAirportDynamics *parent);
virtual ~FGStartupController() {};
virtual ~FGStartupController();
virtual void announcePosition(int id, FGAIFlightPlan *intendedRoute, int currentRoute,
double lat, double lon,
double hdg, double spd, double alt, double radius, int leg,
@ -538,7 +540,8 @@ private:
public:
FGApproachController(FGAirportDynamics * parent);
virtual ~FGApproachController() { };
virtual ~FGApproachController();
virtual void announcePosition(int id, FGAIFlightPlan *intendedRoute, int currentRoute,
double lat, double lon,
double hdg, double spd, double alt, double radius, int leg,