don't destroy iterated map entries; delete _menubar; restore closed

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

diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index 7be1809a34df7bf04092d34f6fa75afc2fc4a8fe..60aac0c3ea24724033861f559028feb6968eb39e 100644 (file)
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@@ -197,8 +197,7 @@ bool fgNavDBInit( FGAirportList *airports,
         exit(-1);
     }
     
-    // skip first two lines
-    inchannel >> skipeol;
+    // skip first line
     inchannel >> skipeol;
     
 #ifdef __MWERKS__
@@ -292,10 +291,10 @@ void fgNavDBAlignLOCwithRunway( FGRunwayList *runways, FGNavList *loclist,
                                 double threshold ) {
     nav_map_type navmap = loclist->get_navaids();
 
-    nav_map_iterator freq = navmap.begin();
+    nav_map_const_iterator freq = navmap.begin();
     while ( freq != navmap.end() ) {
         nav_list_type locs = freq->second;
-        nav_list_iterator loc = locs.begin();
+        nav_list_const_iterator loc = locs.begin();
         while ( loc != locs.end() ) {
             string name = (*loc)->get_name();
             string::size_type pos1 = name.find(" ");