Fix for a crash reported by Maik Justus.

diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index b50f9398329ebc878c4f3b6b679947655c0e8d65..de52894b0e1ab95f52d5f3e37c34f5ababae09f7 100644 (file)
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -165,14 +165,14 @@ FGAIBase::load3DModel(const string& fg_root,
   // SetModel as in ATC/AIEntity.cxx
   osg::Group* personality_branch = new osg::Group;
 
-  model = manager->getModel(path);
-  if (!(model)) {
+  //model = manager->getModel(path);
+  //if (!(model)) {
       model = sgLoad3DModel(fg_root,
                             path,
                             prop_root,
                             sim_time_sec);
-      manager->setModel(path, model.get());
-  }
+      //        manager->setModel(path, model.get());
+      //}
   personality_branch->addChild( model.get() );
 
   return personality_branch;

diff --git a/src/Airports/groundnetwork.cxx b/src/Airports/groundnetwork.cxx
index 2d17d948795d330bc957eb2ca6ee257b5c694705..711efa50b203a8e0e7a97a28cdc7e4c9ab4a9d65 100644 (file)
--- a/src/Airports/groundnetwork.cxx
+++ b/src/Airports/groundnetwork.cxx
@@ -765,6 +765,7 @@ void FGGroundNetwork::checkSpeedAdjustment(int id, double lat,
     SG_LOG(SG_GENERAL, SG_ALERT, "AI error: Trying to access non-existing aircraft in FGGroundNetwork::checkSpeedAdjustment");
   }
   current = i;
+  closest = current;
   previousInstruction = current->getSpeedAdjustment();
   double mindist = HUGE;
   if (activeTraffic.size()) 
@@ -774,7 +775,7 @@ void FGGroundNetwork::checkSpeedAdjustment(int id, double lat,
                        lat,
                        alt);
       //TrafficVector iterator closest;
-      closest = current;
+      //closest = current;
       for (TrafficVectorIterator i = activeTraffic.begin(); 
           i != activeTraffic.end(); i++)
        {