From 54948c502c631935505383f58ebaa48806bb6727 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sun, 6 Mar 2022 18:53:41 +0000
Subject: [PATCH] Location in air: Guard against missing carriers.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since we don’t force node creation, tolerate the node being nil in
the dialog Nasal helpers
---
 gui/dialogs/location-in-air.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gui/dialogs/location-in-air.xml b/gui/dialogs/location-in-air.xml
index 66302894a..9d3fa0f1a 100644
--- a/gui/dialogs/location-in-air.xml
+++ b/gui/dialogs/location-in-air.xml
@@ -62,6 +62,9 @@
         var carriers = props.globals.getNode( "/ai/models" );
 
         combo.removeChildren("value");
+        if (carriers == nil) 
+          return;
+
         foreach (var carrier; carriers.getChildren("carrier")) {
           nameNode = carrier.getNode("name");
           if(nameNode != nil and nameNode.getValue() != nil)
@@ -81,6 +84,9 @@
         combo.addChild("value").setValue("FLOLS");
         combo.addChild("value").setValue("Abeam");
 
+        if (carriers == nil) 
+          return;
+
         foreach (var carrier; carriers.getChildren("carrier")) {
           if (carrier.getNode("name", 1).getValue() == getprop("/sim/presets/carrier")) {
             foreach (var parkpos; carrier.getChildren("parking-pos")) {