From 38687c9e06c564dedc6abd3d80198bf52210b7c3 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Wed, 19 May 2010 23:25:39 +0100
Subject: [PATCH] Avoid a crash with out-of-sync airport runway usage and
 runway definitions.

---
 src/Airports/dynamics.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Airports/dynamics.cxx b/src/Airports/dynamics.cxx
index a323d809c..f45341e5e 100644
--- a/src/Airports/dynamics.cxx
+++ b/src/Airports/dynamics.cxx
@@ -432,6 +432,12 @@ string FGAirportDynamics::chooseRwyByHeading(stringVec rwys,
     double rwyHeading, headingError;
     string runway;
     for (stringVecIterator i = rwys.begin(); i != rwys.end(); i++) {
+        if (!_ap->hasRunwayWithIdent(*i)) {
+          SG_LOG(SG_ATC, SG_WARN, "chooseRwyByHeading: runway " << *i <<
+            " not found at " << _ap->ident());
+          continue;
+        }
+        
         FGRunway *rwy = _ap->getRunwayByIdent((*i));
         rwyHeading = rwy->headingDeg();
         headingError = fabs(heading - rwyHeading);
-- 
2.39.5