Merge branch 'maint' into next

[flightgear.git] / src / Navaids / navdb.cxx

diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index e6979ee9636fc30e2c531dc330bf766c508c1a90..95f7f77eef15f1b72d1e4f32cefc360fa9331230 100644 (file)
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@@ -66,7 +66,7 @@ static FGNavRecord* createNavFromStream(std::istream& aStream)
 {
   int rawType;
   aStream >> rawType;
-  if (aStream.eof()) {
+  if (aStream.eof() || (rawType == 99)) {
     return NULL; // happens with, eg, carrier_nav.dat
   }
   
@@ -81,7 +81,7 @@ static FGNavRecord* createNavFromStream(std::istream& aStream)
   
   if ((rawType >= 7) && (rawType <= 9)) {
     // marker beacons use a different run-time class now
-     FGMarkerBeacon::create(rawType, name, pos);
+     FGMarkerBeaconRecord::create(rawType, name, pos);
      return NULL; // not a nav-record, but that's okay
   }