From d3f63543328ff242650d84aeb9454375945e6160 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 1 Apr 2003 04:13:02 +0000
Subject: [PATCH] Return code to it's original form which works around an
 idiosyncracy in our data.

---
 src/Instrumentation/dme.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Instrumentation/dme.cxx b/src/Instrumentation/dme.cxx
index 48070d7b3..3b74e5e8a 100644
--- a/src/Instrumentation/dme.cxx
+++ b/src/Instrumentation/dme.cxx
@@ -151,8 +151,7 @@ DME::search (double frequency_mhz, double longitude_rad,
                                               longitude_rad,
                                               latitude_rad,
                                               altitude_m);
-    if (ils !=0) {
-        if (ils->get_has_dme()) {
+    if (ils !=0 && ils->get_has_dme()) {
             _transmitter_valid = true;
             _transmitter = Point3D(ils->get_dme_x(),
                                    ils->get_dme_y(),
@@ -171,8 +170,7 @@ DME::search (double frequency_mhz, double longitude_rad,
                                               longitude_rad,
                                               latitude_rad,
                                               altitude_m);
-    if (nav != 0) {
-        if (nav->get_has_dme()) {
+    if (nav != 0 && nav->get_has_dme()) {
             _transmitter_valid = true;
             _transmitter = Point3D(nav->get_x(),
                                    nav->get_y(),
-- 
2.39.5