From: James Turner <zakalawe@mac.com>
Date: Tue, 15 Oct 2013 21:27:19 +0000 (+0100)
Subject: Bug 1217, crash on AI traffic data.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a45e3d1d0760d133cb9a25434fc8022674451e17;p=flightgear.git

Bug 1217, crash on AI traffic data.

Guard against flight plans with missing airport
information.
---

diff --git a/src/GUI/MapWidget.cxx b/src/GUI/MapWidget.cxx
index 7edb0c93e..c35c1e6fe 100644
--- a/src/GUI/MapWidget.cxx
+++ b/src/GUI/MapWidget.cxx
@@ -1572,10 +1572,15 @@ void MapWidget::drawAIAircraft(const SGPropertyNode* model, const SGGeod& pos, d
     if (aircraft) {
         FGAIAircraft* p = static_cast<FGAIAircraft*>(aircraft.get());
         if (p->GetFlightPlan()) {
-            originICAO = p->GetFlightPlan()->departureAirport()->ident();
-            destinationICAO = p->GetFlightPlan()->arrivalAirport()->ident();
-        }
-    }
+            if (p->GetFlightPlan()->departureAirport()) {
+                originICAO = p->GetFlightPlan()->departureAirport()->ident();
+            }
+            
+            if (p->GetFlightPlan()->arrivalAirport()) {
+                destinationICAO = p->GetFlightPlan()->arrivalAirport()->ident();
+            }
+        } // of flight-plan exists
+    } // of check for AIBase-derived instance
 
   // draw callsign / altitude / speed
     int altFt50 = static_cast<int>(pos.getElevationFt() / 50.0) * 50;