From: Durk Talsma Date: Sat, 22 Oct 2011 15:57:37 +0000 (+0200) Subject: Potential fix for bug #471 (crash in checkspeedadjustment). X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a6de24461e797871d3c841f045343b05929378fb;p=flightgear.git Potential fix for bug #471 (crash in checkspeedadjustment). --- diff --git a/src/Airports/groundnetwork.cxx b/src/Airports/groundnetwork.cxx index a3a3245fe..fc943fb15 100644 --- a/src/Airports/groundnetwork.cxx +++ b/src/Airports/groundnetwork.cxx @@ -853,6 +853,7 @@ void FGGroundNetwork::checkSpeedAdjustment(int id, double lat, SGGeod curr(SGGeod::fromDegM(lon, lat, alt)); //TrafficVector iterator closest; closest = current; + closestOnNetwork = current; for (TrafficVectorIterator i = activeTraffic.begin(); i != activeTraffic.end(); i++) { if (i == current) { @@ -953,7 +954,7 @@ void FGGroundNetwork::checkSpeedAdjustment(int id, double lat, } } } - if ((closest == closestOnNetwork) && (current->getPriority() < closest->getPriority()) && needBraking) { + if ((closest->getId() == closestOnNetwork->getId()) && (current->getPriority() < closest->getPriority()) && needBraking) { swap(current, closest); } }