Merge branch 'next' into durk-atc

[flightgear.git] / src / Instrumentation / dme.cxx

diff --git a/src/Instrumentation/dme.cxx b/src/Instrumentation/dme.cxx
index 5685dbabec606efc20f7d21e2429efd58cc1b8a1..925681e0acbe08bd444cf25f5573a8bdd657a487 100644 (file)
--- a/src/Instrumentation/dme.cxx
+++ b/src/Instrumentation/dme.cxx
@@ -97,6 +97,7 @@ DME::update (double delta_time_sec)
         _time_before_search_sec = 0;
         _last_frequency_mhz = frequency_mhz;
     }
+    _frequency_node->setDoubleValue(frequency_mhz);
 
                                 // Get the aircraft position
     double longitude_rad =
@@ -146,7 +147,8 @@ DME::update (double delta_time_sec)
         }
         _distance_node->setDoubleValue( tmp_dist );
         _speed_node->setDoubleValue(speed_kt);
-        _time_node->setDoubleValue(distance_nm/speed_kt*60.0);
+        if (SGLimitsd::min() < fabs(speed_kt))
+          _time_node->setDoubleValue(distance_nm/speed_kt*60.0);
         
     } else {
         _last_distance_nm = 0;